diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java index 9dfafd966..79c1528da 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java @@ -14,8 +14,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; +import org.springframework.ide.vscode.commons.languageserver.completion.IndentUtil; import org.springframework.ide.vscode.commons.languageserver.util.DocumentRegion; import org.springframework.ide.vscode.commons.languageserver.util.SnippetBuilder; +import org.springframework.ide.vscode.commons.util.text.IDocument; import com.google.common.base.Supplier; @@ -34,8 +36,14 @@ public class JavaSnippetBuilder{ } public DocumentEdits createEdit(DocumentRegion query, String template) { - DocumentEdits edit = new DocumentEdits(query.getDocument()); - edit.replace(query.getStart(), query.getEnd(), createSnippet(template)); + IDocument doc = query.getDocument(); + IndentUtil indentUtil = new IndentUtil(doc); + + DocumentEdits edit = new DocumentEdits(doc); + String snippet = createSnippet(template); + + String indentedSnippet = indentUtil.applyIndentation(snippet, indentUtil.getReferenceIndent(query.getStart(), doc)) ; + edit.replace(query.getStart(), query.getEnd(), indentedSnippet); return edit; } diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/IndentUtil.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/IndentUtil.java new file mode 100644 index 000000000..3c9947067 --- /dev/null +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/IndentUtil.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2017 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.commons.languageserver.completion; + +import org.springframework.ide.vscode.commons.languageserver.util.DocumentRegion; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.text.IDocument; +import org.springframework.ide.vscode.commons.util.text.IRegion; + +import com.google.common.base.Strings; + +/** + * Helper methods to manipulate indentation levels in yaml content. + * + * @author Kris De Volder + */ +public class IndentUtil { + + /** + * Some functions introduce line separators and this may depend on the context (i.e. default line separator + * for the current document). + */ + public final String NEWLINE; + + public IndentUtil(String newline) { + this.NEWLINE = newline; + Assert.isNotNull(NEWLINE); + } + + + public IndentUtil(IDocument doc) { + this(doc.getDefaultLineDelimiter()); + } + + public String applyIndentation(String text, String indentStr) { + return text.replaceAll("\\n", "\n"+indentStr); + } + + + public String getReferenceIndent(int offset, IDocument doc) { + //Apply indentfix, this is magic vscode seems to apply to edits returned by language server. So our harness has to + // mimick that behavior. See https://github.com/Microsoft/language-server-protocol/issues/83 + IRegion referenceLine = doc.getLineInformationOfOffset(offset); + DocumentRegion queryPrefix = new DocumentRegion(doc, referenceLine.getOffset(), offset); + return queryPrefix.leadingWhitespace().toString(); + } + +} diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java index c8706cb94..2e21f8b8e 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java @@ -31,6 +31,7 @@ import org.springframework.ide.vscode.commons.languageserver.completion.Document import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.SortKeys; +import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.Renderable; import org.springframework.ide.vscode.commons.util.StringUtil; @@ -228,15 +229,18 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine { //Vscode applies some magic indent to a multi-line edit text. We do everything ourself so we have adjust for the magic // and do some kind of 'inverse magic' here. //See here: https://github.com/Microsoft/language-server-protocol/issues/83 - int referenceLine = start.getLine(); - int referenceLineIndent = doc.getLineIndentation(referenceLine); - int vscodeMagicIndent = Math.min(start.getCharacter(), referenceLineIndent); - return vscodeMagicIndent>0 - ? StringUtil.stripIndentation(vscodeMagicIndent, newText) - : newText; + IndentUtil indenter = new IndentUtil(doc); + try { + String refIndent = indenter.getReferenceIndent(doc.toOffset(start), doc); + if (!refIndent.isEmpty()) { + return StringUtil.stripIndentation(refIndent, newText); + } + } catch (BadLocationException e) { + Log.log(e); + } + return newText; } - @Override public CompletableFuture resolveCompletion(CompletionItem unresolved) { resolver.resolveNow(unresolved); diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java index 7cf43f095..98902910b 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java @@ -295,4 +295,13 @@ public class DocumentRegion implements CharSequence { public Range asRange() throws BadLocationException { return doc.toRange(asRegion()); } + + public DocumentRegion leadingWhitespace() { + int howMany = 0; + int len = length(); + while (howMany