From 574cd9e742d551173585ec9450d9d62b9394982d Mon Sep 17 00:00:00 2001
From: BoykoAlex <aboyko@pivotal.io>
Date: Fri, 28 Jul 2017 14:24:30 -0400
Subject: [PATCH] Completions testing with
 -Dlsp.completions.indentation.enable=true

---
 .../atom-manifest-yaml/.travis.yml            | 15 ----------
 .../atom-manifest-yaml/appveyor.yml           | 27 -----------------
 .../languageserver/testharness/Editor.java    | 30 +++++++++++--------
 3 files changed, 18 insertions(+), 54 deletions(-)
 delete mode 100644 atom-extensions/atom-manifest-yaml/.travis.yml
 delete mode 100644 atom-extensions/atom-manifest-yaml/appveyor.yml

diff --git a/atom-extensions/atom-manifest-yaml/.travis.yml b/atom-extensions/atom-manifest-yaml/.travis.yml
deleted file mode 100644
index f87ce4082..000000000
--- a/atom-extensions/atom-manifest-yaml/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: objective-c
-
-notifications:
-  email:
-    on_success: never
-    on_failure: change
-
-script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
-
-git:
-  depth: 10
-
-branches:
-  only:
-- master
\ No newline at end of file
diff --git a/atom-extensions/atom-manifest-yaml/appveyor.yml b/atom-extensions/atom-manifest-yaml/appveyor.yml
deleted file mode 100644
index 9fa4278db..000000000
--- a/atom-extensions/atom-manifest-yaml/appveyor.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "{build}"
-
-platform: x64
-
-branches:
-    only:
-      - master
-
-clone_depth: 10
-
-skip_tags: true
-
-environment:
-  APM_TEST_PACKAGES:
-
-  matrix:
-  - ATOM_CHANNEL: stable
-  - ATOM_CHANNEL: beta
-
-install:
-  - ps: Install-Product node 6
-
-build_script:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
-
-test: off
-deploy: off
\ No newline at end of file
diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
index fe3e73d13..7274cad87 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
@@ -417,19 +417,25 @@ public class Editor {
 		String docText = doc.getText();
 		if (edit!=null) {
 			String replaceWith = edit.getNewText();
-			//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
-			int referenceLine = edit.getRange().getStart().getLine();
-			int cursorOffset = edit.getRange().getStart().getCharacter();
-			String referenceIndent = doc.getLineIndentString(referenceLine);
-			if (cursorOffset<referenceIndent.length()) {
-				referenceIndent = referenceIndent.substring(0, cursorOffset);
-			}
-			replaceWith = replaceWith.replaceAll("\\n", "\n"+referenceIndent);
+			int cursorReplaceOffset = 0;
 
-			int cursorReplaceOffset = replaceWith.indexOf(VS_CODE_CURSOR_MARKER);
-			if (cursorReplaceOffset>=0) {
-				replaceWith = replaceWith.substring(0, cursorReplaceOffset) + replaceWith.substring(cursorReplaceOffset+VS_CODE_CURSOR_MARKER.length());
+			if (!Boolean.getBoolean("lsp.completions.indentation.enable")) {
+				//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
+				int referenceLine = edit.getRange().getStart().getLine();
+				int cursorOffset = edit.getRange().getStart().getCharacter();
+				String referenceIndent = doc.getLineIndentString(referenceLine);
+				if (cursorOffset<referenceIndent.length()) {
+					referenceIndent = referenceIndent.substring(0, cursorOffset);
+				}
+				replaceWith = replaceWith.replaceAll("\\n", "\n"+referenceIndent);
+			}
+
+			// Replace the cursor string
+			cursorReplaceOffset = replaceWith.indexOf(VS_CODE_CURSOR_MARKER);
+			if (cursorReplaceOffset >= 0) {
+				replaceWith = replaceWith.substring(0, cursorReplaceOffset)
+						+ replaceWith.substring(cursorReplaceOffset + VS_CODE_CURSOR_MARKER.length());
 			} else {
 				cursorReplaceOffset = replaceWith.length();
 			}