From 6191c23b23736e32013337c68f7114359f40d0f8 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 3 Apr 2017 10:27:55 -0700 Subject: [PATCH] Fix a bug and fix tests so it catches that kind of bug in future. Bug caused by using == to compare Language ids instead of .equals --- .../ide/vscode/languageserver/testharness/Editor.java | 4 ++-- .../ide/vscode/concourse/PipelineYmlSchema.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 3496472a2..d2f547796 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 @@ -102,9 +102,9 @@ public class Editor { public Editor(LanguageServerHarness harness, String contents, String languageId) throws Exception { this.harness = harness; - this.languageId = languageId; + this.languageId = new String(languageId); // So we can catch bugs that use == for langauge id comparison. EditorState state = new EditorState(contents); - this.document = harness.openDocument(harness.createWorkingCopy(state.documentContents, languageId)); + this.document = harness.openDocument(harness.createWorkingCopy(state.documentContents, this.languageId)); this.selectionStart = state.selectionStart; this.selectionEnd = state.selectionEnd; this.ignoredTypes = new HashSet<>(); diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java index 59b6f1b1f..5194844e6 100644 --- a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java +++ b/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java @@ -217,7 +217,7 @@ public class PipelineYmlSchema implements YamlSchema { addProp(task, "params", t_string_params); task.require((dc) -> { String languageId = dc.getDocument().getLanguageId(); - if (languageId==LanguageIds.CONCOURSE_PIPELINE) { + if (LanguageIds.CONCOURSE_PIPELINE.equals(languageId)) { Node parentImageDef = getParentPropertyNode("image", models, dc); if (parentImageDef==null) { return Constraints.requireOneOf("image_resource", "image");