From 5191e7639a59158ff7e7138be2c84ee50d1d7bf0 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 8 May 2017 15:32:54 -0700 Subject: [PATCH] cf-manifest editor only reconciles manifest-yaml docs --- .../vscode/manifest/yaml/ManifestYamlLanguageServer.java | 8 ++++---- .../ide/vscode/manifest/yaml/ManifestYamlEditorTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java index 7be30bf07..4b716cbfd 100644 --- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java +++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java @@ -76,11 +76,11 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer { // SimpleWorkspaceService workspace = getWorkspaceService(); documents.onDidChangeContent(params -> { TextDocument doc = params.getDocument(); -// if (LanguageId.CF_MANIFEST.equals(doc.getLanguageId())) { + if (LanguageId.CF_MANIFEST.equals(doc.getLanguageId())) { validateWith(doc.getId(), engine); -// } else { -// validateWith(doc.getId(), IReconcileEngine.NULL); -// } + } else { + validateWith(doc.getId(), IReconcileEngine.NULL); + } }); // workspace.onDidChangeConfiguraton(settings -> { diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java index db94ecf2d..7e62c5fc8 100644 --- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java +++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java @@ -65,7 +65,7 @@ public class ManifestYamlEditorTest { } @Test public void reconcileRunsOnDocumentOpenAndChange() throws Exception { - LanguageServerHarness harness = new LanguageServerHarness(ManifestYamlLanguageServer::new); + LanguageServerHarness harness = new LanguageServerHarness(ManifestYamlLanguageServer::new, LanguageId.CF_MANIFEST); harness.intialize(null); Editor editor = harness.newEditor(