From d56937591ca958cb0e5aa8620fd1ef5ba4b3c16d Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 3 Apr 2017 16:59:14 -0700 Subject: [PATCH] Undo the changes that show missing toplevel property at end of file --- .../commons/languageserver/util/DocumentRegion.java | 9 --------- .../commons/yaml/reconcile/YamlSchemaProblems.java | 2 -- .../vscode/languageserver/testharness/Editor.java | 12 ------------ .../ide/vscode/concourse/ConcourseEditorTest.java | 5 +---- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java index a84a9f3f3..4a2c58bff 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java @@ -282,13 +282,4 @@ public class DocumentRegion implements CharSequence { } return false; } - - /** - * Create a document region of lenght 0 at the every end of the document. - */ - public static DocumentRegion endOf(IDocument doc) { - DocumentRegion trimmedDoc = new DocumentRegion(doc).trimEnd(); - return new DocumentRegion(doc, trimmedDoc.getLength(), trimmedDoc.getLength()); - } - } \ No newline at end of file diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java index 68d8ad7fb..ad1fcd0f2 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java @@ -123,8 +123,6 @@ public class YamlSchemaProblems { return problem(MISSING_PROPERTY, msg, underline); } } - } else if (parent==null) { - return problem(MISSING_PROPERTY, msg, DocumentRegion.endOf(doc)); } return problem(MISSING_PROPERTY, msg, map); } diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java index 315d7b821..af1ac93d8 100644 --- a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java +++ b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java @@ -618,16 +618,4 @@ public class Editor { public String getLanguageId() { return languageId; } - - /** - * Verifies that a given Range corresponds with the end of the document in the editor. - */ - public void assertIsEndOfFile(Range range) { - int documentLen = document.getText().length(); - int start = document.toOffset(range.getStart()); - int end = document.toOffset(range.getEnd()); - assertEquals(documentLen, start); - assertEquals(documentLen, end); - } - } diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java index ffc490c6b..777103352 100644 --- a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java +++ b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java @@ -2268,10 +2268,7 @@ public class ConcourseEditorTest { editor = harness.newEditor(LanguageIds.CONCOURSE_TASK, "image: some-image" ); - List problems = editor.assertProblems("|[platform, run] are required"); - for (Diagnostic p : problems) { - editor.assertIsEndOfFile(p.getRange()); - } + editor.assertProblems("image: some-image|[platform, run] are required"); editor = harness.newEditor(LanguageIds.CONCOURSE_TASK, "platform: a-platform\n" +