Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compliation errors due to typefox lsapi evolution

Browse Source
This commit is contained in:
Kris De Volder
2016-10-13 14:53:27 -07:00
parent 2551a5e997
commit 547b73b04b
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java
View File

@@ -20,9 +20,11 @@ import org.springframework.ide.vscode.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.util.TextDocument;
import io.typefox.lsapi.Diagnostic;
import io.typefox.lsapi.DiagnosticImpl;
import io.typefox.lsapi.DiagnosticSeverity;
import io.typefox.lsapi.ServerCapabilities;
import io.typefox.lsapi.ServerCapabilitiesImpl;
import io.typefox.lsapi.TextDocumentSyncKind;
import io.typefox.lsapi.impl.DiagnosticImpl;
import io.typefox.lsapi.impl.ServerCapabilitiesImpl;
/**
* Language Server for Spring Boot Application Properties files
@@ -57,7 +59,7 @@ public class ApplicationPropertiesLanguageServer extends SimpleLanguageServer {
DiagnosticImpl diagnostic = new DiagnosticImpl();
diagnostic.setMessage(createSyntaxErrorMessage(problem.getMessage()));
diagnostic.setCode(problem.getCode());
diagnostic.setSeverity(Diagnostic.SEVERITY_ERROR);
diagnostic.setSeverity(DiagnosticSeverity.Error);
diagnostic.setSource("java-properties");
diagnostic.setRange(doc.toRange(problem.getOffset(), problem.getLength()));
return diagnostic;
@@ -78,7 +80,7 @@ public class ApplicationPropertiesLanguageServer extends SimpleLanguageServer {
protected ServerCapabilitiesImpl getServerCapabilities() {
ServerCapabilitiesImpl c = new ServerCapabilitiesImpl();
c.setTextDocumentSync(ServerCapabilities.SYNC_FULL);
c.setTextDocumentSync(TextDocumentSyncKind.Full);
return c;
}

7
vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
View File

@@ -135,11 +135,6 @@ public class Main {
server.onError(message, err);
});
try {
jsonServer.join();
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
}
jsonServer.join();
}
}

3
vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java
View File

@@ -22,6 +22,7 @@ import org.springframework.ide.vscode.testharness.LanguageServerHarness;
import io.typefox.lsapi.InitializeResult;
import io.typefox.lsapi.ServerCapabilities;
import io.typefox.lsapi.TextDocumentSyncKind;
/**
* Boot app properties file language server tests
@@ -50,7 +51,7 @@ public class ApplicationPropertiesLanguageServerTest {
}
private void assertExpectedInitResult(InitializeResult initResult) {
assertThat(initResult.getCapabilities().getTextDocumentSync()).isEqualTo(ServerCapabilities.SYNC_FULL);
assertThat(initResult.getCapabilities().getTextDocumentSync()).isEqualTo(TextDocumentSyncKind.Full);
}
}