Skip to content

Commit 37b0678

Browse files
committed
GH-1153: due to the new insert text mode setting <as-is>, we do not need to deal with client-side magic indentation anymore
1 parent ae68b8e commit 37b0678

File tree

1 file changed

+11
-11
lines changed
  • headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness

1 file changed

+11
-11
lines changed

headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -458,17 +458,17 @@ public void apply(CompletionItem completion) throws Exception {
458458
String replaceWith = edit.getLeft().getNewText();
459459
int cursorReplaceOffset = 0;
460460

461-
if (!Boolean.getBoolean("lsp.completions.indentation.enable")) {
462-
//Apply indentfix, this is magic vscode seems to apply to edits returned by language server. So our harness has to
463-
// mimick that behavior. See https://github.com/Microsoft/language-server-protocol/issues/83
464-
int referenceLine = edit.getLeft().getRange().getStart().getLine();
465-
int cursorOffset = edit.getLeft().getRange().getStart().getCharacter();
466-
String referenceIndent = doc.getLineIndentString(referenceLine);
467-
if (cursorOffset<referenceIndent.length()) {
468-
referenceIndent = referenceIndent.substring(0, cursorOffset);
469-
}
470-
replaceWith = replaceWith.replaceAll("\\n", "\n"+referenceIndent);
471-
}
461+
// if (!Boolean.getBoolean("lsp.completions.indentation.enable")) {
462+
// //Apply indentfix, this is magic vscode seems to apply to edits returned by language server. So our harness has to
463+
// // mimick that behavior. See https://github.com/Microsoft/language-server-protocol/issues/83
464+
// int referenceLine = edit.getLeft().getRange().getStart().getLine();
465+
// int cursorOffset = edit.getLeft().getRange().getStart().getCharacter();
466+
// String referenceIndent = doc.getLineIndentString(referenceLine);
467+
// if (cursorOffset<referenceIndent.length()) {
468+
// referenceIndent = referenceIndent.substring(0, cursorOffset);
469+
// }
470+
// replaceWith = replaceWith.replaceAll("\\n", "\n"+referenceIndent);
471+
// }
472472

473473
// Replace the cursor string
474474
cursorReplaceOffset = replaceWith.indexOf(VS_CODE_CURSOR_MARKER);

0 commit comments

Comments
 (0)