Compare commits
1 Commits
0.0.8
...
Syntax-Onl
| Author | SHA1 | Date | |
|---|---|---|---|
|
f5cdda7625 |
Binary file not shown.
Binary file not shown.
@@ -36,14 +36,8 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
|
||||
|
||||
private static final Logger logger = LogManager.getLogger(JavaTXTextDocumentService.class);
|
||||
LanguageClient client;
|
||||
HashMap<String, List<InlayHint>> globalInlayHintMap = new HashMap<>();
|
||||
Boolean currentlyCalculating = false;
|
||||
HashMap<String, List<Diagnostic>> globalDiagnosticsMap = new HashMap<>();
|
||||
HashMap<String, String> textDocuments = new HashMap<>();
|
||||
CodeSnippetOptions codeSnippetOptions = new CodeSnippetOptions();
|
||||
TextHelper textHelper = new TextHelper();
|
||||
Boolean dontShowHints = false;
|
||||
TypeResolver typeResolver = new TypeResolver();
|
||||
Path fileRoot = null;
|
||||
|
||||
public void setClient(LanguageClient client) {
|
||||
@@ -51,8 +45,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
|
||||
}
|
||||
|
||||
public void setFileRoot(List<WorkspaceFolder> root) {
|
||||
|
||||
//TODO: Nicht nur das erste Element nehmen sondern alle beachten
|
||||
fileRoot = Path.of(URI.create(root.get(0).getUri()));
|
||||
}
|
||||
|
||||
@@ -100,7 +92,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
|
||||
*/
|
||||
@Override
|
||||
public void didChange(DidChangeTextDocumentParams params) {
|
||||
log("[didChange] Client triggered didChange Event.", MessageType.Info);
|
||||
client.logMessage(new MessageParams(MessageType.Info,"[didChange] Client triggered didChange Event."));
|
||||
|
||||
AtomicReference<String> summedUp = new AtomicReference<>("");
|
||||
params.getContentChanges().forEach(el -> summedUp.set(summedUp.get() + el.getText()));
|
||||
@@ -138,183 +130,20 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
|
||||
*/
|
||||
@Override
|
||||
public CompletableFuture<List<? extends TextEdit>> formatting(DocumentFormattingParams params) {
|
||||
log("[formatting] Client requested formatting.", MessageType.Info);
|
||||
|
||||
List<TextEdit> edits = new ArrayList<>();
|
||||
|
||||
|
||||
String[] lines = textDocuments.get(params.getTextDocument().getUri()).split("\n");
|
||||
StringBuilder formattedText = new StringBuilder();
|
||||
|
||||
for (String line : lines) {
|
||||
formattedText.append(line.stripTrailing()).append("\n");
|
||||
}
|
||||
|
||||
TextEdit edit = new TextEdit();
|
||||
edit.setRange(new Range(new Position(0, 0), new Position(lines.length, 0)));
|
||||
edit.setNewText(formattedText.toString().trim());
|
||||
|
||||
edits.add(edit);
|
||||
return CompletableFuture.completedFuture(edits);
|
||||
return CompletableFuture.completedFuture(Collections.emptyList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void didClose(DidCloseTextDocumentParams params) {
|
||||
}
|
||||
|
||||
private void log(String message, MessageType type) {
|
||||
client.logMessage(new MessageParams(type, message));
|
||||
switch (type) {
|
||||
case Error -> logger.error(message);
|
||||
case Warning -> logger.warn(message);
|
||||
case Info -> logger.info(message);
|
||||
default -> logger.debug(message);
|
||||
}
|
||||
}
|
||||
|
||||
private InlayHint getInlayHint(LSPVariable variable) {
|
||||
InlayHint inlayHint = new InlayHint();
|
||||
|
||||
String typeDisplay = "";
|
||||
for (Type type : variable.getPossibleTypes()) {
|
||||
typeDisplay += " | " + type.getType().replaceAll("GTV ", "");
|
||||
}
|
||||
|
||||
|
||||
inlayHint.setLabel(typeDisplay.length() > 2 ? typeDisplay.substring(2) : typeDisplay);
|
||||
inlayHint.setPosition(new Position(variable.getLine() - 1, variable.getCharPosition()));
|
||||
inlayHint.setKind(InlayHintKind.Parameter);
|
||||
inlayHint.setPaddingRight(true);
|
||||
inlayHint.setPaddingRight(true);
|
||||
return inlayHint;
|
||||
}
|
||||
|
||||
private Diagnostic getDiagnostic(LSPVariable variable, String fileUri, Type type) {
|
||||
Range errorRange = new Range(
|
||||
new Position(variable.getLine() - 1, variable.getCharPosition()), // Startposition
|
||||
new Position(variable.getLine() - 1, textHelper.getEndingCharOfStartingChar(variable.getLine() - 1, variable.getCharPosition(), textDocuments.get(fileUri))) // Endposition
|
||||
);
|
||||
Diagnostic diagnostic = new Diagnostic(
|
||||
errorRange,
|
||||
//TODO: REMOVE! Temporary Fix because GTV, like TPH can be thrown away in the TypeResolver
|
||||
type.getType().replaceAll("GTV ", ""),
|
||||
DiagnosticSeverity.Hint,
|
||||
"JavaTX Language Server"
|
||||
);
|
||||
diagnostic.setCode(type.isGeneric() ? "GENERIC" : "TYPE");
|
||||
|
||||
return diagnostic;
|
||||
}
|
||||
|
||||
private void updateGlobalMaps(List<Diagnostic> diagnostics, List<InlayHint> typeHint, String uri) {
|
||||
globalDiagnosticsMap.put(uri, diagnostics);
|
||||
globalInlayHintMap.put(uri, typeHint);
|
||||
}
|
||||
|
||||
private void updateClient(LanguageClient client) {
|
||||
client.refreshInlayHints();
|
||||
client.refreshDiagnostics();
|
||||
}
|
||||
|
||||
private void startLoading(String taskName, String title, LanguageClient client) {
|
||||
Either<String, Integer> token = Either.forLeft(taskName);
|
||||
client.createProgress(new WorkDoneProgressCreateParams(token));
|
||||
|
||||
WorkDoneProgressBegin begin = new WorkDoneProgressBegin();
|
||||
begin.setTitle(title);
|
||||
begin.setCancellable(false);
|
||||
begin.setPercentage(0);
|
||||
|
||||
ProgressParams beginParams = new ProgressParams(token, Either.forLeft(begin));
|
||||
client.notifyProgress(beginParams);
|
||||
|
||||
}
|
||||
|
||||
private void stopLoading(String taskName, String title, LanguageClient client) {
|
||||
Either<String, Integer> token = Either.forLeft(taskName);
|
||||
WorkDoneProgressEnd end = new WorkDoneProgressEnd();
|
||||
end.setMessage(title);
|
||||
|
||||
ProgressParams endParams = new ProgressParams(token, Either.forLeft(end));
|
||||
client.notifyProgress(endParams);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void didSave(DidSaveTextDocumentParams didSaveTextDocumentParams) {
|
||||
log("[didSave] Client triggered didSave-Event.", MessageType.Info);
|
||||
|
||||
startLoading("compile-task", "Inferring types...", client);
|
||||
|
||||
LanguageServerInterface languageServerInterface = new LanguageServerInterface();
|
||||
|
||||
if (!currentlyCalculating) {
|
||||
currentlyCalculating = true;
|
||||
|
||||
ArrayList<Diagnostic> diagnostics = new ArrayList<>();
|
||||
var sWatch = Stopwatch.createUnstarted();
|
||||
sWatch.start();
|
||||
|
||||
try {
|
||||
|
||||
if (textDocuments.get(didSaveTextDocumentParams.getTextDocument().getUri()) == null) {
|
||||
log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
|
||||
}
|
||||
ArrayList<LSPVariable> typesOfMethodAndParameters = typeResolver.infereInput(textDocuments.get(didSaveTextDocumentParams.getTextDocument().getUri()), didSaveTextDocumentParams.getTextDocument().getUri());
|
||||
|
||||
List<InlayHint> typeHint = new ArrayList<>();
|
||||
|
||||
for (var variable : typesOfMethodAndParameters) {
|
||||
|
||||
InlayHint inlayHint = getInlayHint(variable);
|
||||
typeHint.add(inlayHint);
|
||||
|
||||
|
||||
//Diagnostics of Types
|
||||
for (var type : variable.getPossibleTypes()) {
|
||||
Diagnostic diagnostic = getDiagnostic(variable, didSaveTextDocumentParams.getTextDocument().getUri(), type);
|
||||
diagnostics.add(diagnostic);
|
||||
}
|
||||
}
|
||||
|
||||
updateGlobalMaps(diagnostics, typeHint, didSaveTextDocumentParams.getTextDocument().getUri());
|
||||
|
||||
PublishDiagnosticsParams diagnosticsParams = new PublishDiagnosticsParams(didSaveTextDocumentParams.getTextDocument().getUri(), diagnostics);
|
||||
client.publishDiagnostics(diagnosticsParams);
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
|
||||
client.showMessage(new MessageParams(MessageType.Error, e.getMessage()));
|
||||
updateGlobalMaps(new ArrayList<>(), new ArrayList<>(), didSaveTextDocumentParams.getTextDocument().getUri());
|
||||
|
||||
} finally {
|
||||
currentlyCalculating = false;
|
||||
sWatch.stop();
|
||||
log("[didSave] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
stopLoading("compile-task", "Types successfully inferred", client);
|
||||
|
||||
dontShowHints = false;
|
||||
updateClient(client);
|
||||
|
||||
ArrayList<File> files = new ArrayList<>();
|
||||
|
||||
try (Stream<Path> stream = Files.walk(Paths.get(fileRoot.toUri()))) {
|
||||
stream.filter(Files::isRegularFile)
|
||||
.forEach(el -> files.add(el.toFile()));
|
||||
} catch (IOException e) {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompletableFuture<List<InlayHint>> inlayHint(InlayHintParams params) {
|
||||
log("[inlayHint] The Client requested Inlay-Hints.", MessageType.Info);
|
||||
return CompletableFuture.supplyAsync(() -> dontShowHints ? Collections.emptyList() : globalInlayHintMap.get(params.getTextDocument().getUri()) == null ? Collections.emptyList() : globalInlayHintMap.get(params.getTextDocument().getUri()));
|
||||
}
|
||||
return CompletableFuture.completedFuture(Collections.emptyList());}
|
||||
|
||||
@Override
|
||||
public void willSave(WillSaveTextDocumentParams params) {
|
||||
@@ -445,95 +274,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
|
||||
|
||||
@Override
|
||||
public CompletableFuture<List<Either<Command, CodeAction>>> codeAction(CodeActionParams params) {
|
||||
log("[codeAction] Client requested Insert at Line [" + params.getRange().getStart().getLine() + "] and from Char [" + params.getRange().getStart().getCharacter() + "] to [" + params.getRange().getEnd().getCharacter() + "].", MessageType.Info);
|
||||
List<Either<Command, CodeAction>> actions = new ArrayList<>();
|
||||
|
||||
|
||||
List<Diagnostic> diagnosticInCurrentDocument = params.getContext().getDiagnostics();
|
||||
Range requestedRange = params.getRange();
|
||||
|
||||
//All Diagnostics that are in range of the hover -> All Diagnostics of the selected Variable and thus all Types of the Variable
|
||||
List<Diagnostic> diagnosticsOverlappingHover = diagnosticInCurrentDocument.stream()
|
||||
.filter(diagnostic -> rangesOverlap(diagnostic.getRange(), requestedRange)).toList();
|
||||
|
||||
Range rangeOfInsert = params.getRange();
|
||||
String documentUri = params.getTextDocument().getUri();
|
||||
|
||||
|
||||
for (Diagnostic typeDiagnostic : diagnosticsOverlappingHover) {
|
||||
try {
|
||||
String typeWithReplacedVariable = typeDiagnostic.getMessage() +
|
||||
" " +
|
||||
textHelper.getTextOfChars(
|
||||
textDocuments.get(params.getTextDocument().getUri()),
|
||||
rangeOfInsert.getStart().getLine(),
|
||||
rangeOfInsert.getStart().getCharacter(),
|
||||
rangeOfInsert.getEnd().getCharacter()
|
||||
);
|
||||
|
||||
ArrayList<TextEdit> listOfChanges = new ArrayList<>();
|
||||
|
||||
if (typeDiagnostic.getCode().getLeft().equals("GENERIC")) {
|
||||
for (var diagnostic : globalDiagnosticsMap.get(params.getTextDocument().getUri())) {
|
||||
|
||||
if (diagnostic.getMessage().contains(typeDiagnostic.getMessage()) || typeDiagnostic.getMessage().contains(diagnostic.getMessage())) {
|
||||
String genericType = diagnostic.getMessage() +
|
||||
" " +
|
||||
textHelper.getTextOfChars(
|
||||
textDocuments.get(params.getTextDocument().getUri()),
|
||||
diagnostic.getRange().getStart().getLine(),
|
||||
diagnostic.getRange().getStart().getCharacter(),
|
||||
diagnostic.getRange().getEnd().getCharacter()
|
||||
);
|
||||
listOfChanges.add(new TextEdit(diagnostic.getRange(), genericType));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
listOfChanges.add(new TextEdit(rangeOfInsert, typeWithReplacedVariable));
|
||||
}
|
||||
|
||||
var isTypeImported = false;
|
||||
|
||||
if (!typeDiagnostic.getCode().getLeft().equalsIgnoreCase("generic")) {
|
||||
isTypeImported = typeResolver.isTypeImported(textDocuments.get(params.getTextDocument().getUri()), typeDiagnostic.getMessage());
|
||||
}
|
||||
if (!isTypeImported && !typeDiagnostic.getMessage().equals("void") && !typeDiagnostic.getCode().getLeft().equals("GENERIC")) {
|
||||
Range importRange = new Range(new Position(0, 0), new Position(0, 0));
|
||||
|
||||
var typeWithoutGenerics = typeDiagnostic.getMessage().contains("<") ? typeDiagnostic.getMessage().substring(0, typeDiagnostic.getMessage().indexOf('<')) : typeDiagnostic.getMessage();
|
||||
listOfChanges.add(new TextEdit(importRange, "import " + typeWithoutGenerics + ";\n"));
|
||||
}
|
||||
|
||||
Map<String, List<TextEdit>> changes = new HashMap<>();
|
||||
changes.put(documentUri, listOfChanges);
|
||||
|
||||
WorkspaceEdit edit = new WorkspaceEdit();
|
||||
edit.setChanges(changes);
|
||||
|
||||
CodeAction action = new CodeAction("Insert " + typeDiagnostic.getMessage());
|
||||
action.setKind(CodeActionKind.QuickFix);
|
||||
action.setEdit(edit);
|
||||
actions.add(Either.forRight(action));
|
||||
} catch (Exception e) {
|
||||
log("Error creating Actions, returning empty List. The Error was: " + e.getMessage(), MessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dontShowHints = true;
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
return actions;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private boolean rangesOverlap(Range range1, Range range2) {
|
||||
int start1 = range1.getStart().getLine() * 1000 + range1.getStart().getCharacter();
|
||||
int end1 = range1.getEnd().getLine() * 1000 + range1.getEnd().getCharacter();
|
||||
int start2 = range2.getStart().getLine() * 1000 + range2.getStart().getCharacter();
|
||||
int end2 = range2.getEnd().getLine() * 1000 + range2.getEnd().getCharacter();
|
||||
|
||||
return start1 <= end2 && start2 <= end1;
|
||||
return CompletableFuture.completedFuture(Collections.emptyList());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user