From e631fb0a9ed409ca935855be05aa426c0dd89458 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 4 Aug 2017 16:45:22 -0700 Subject: [PATCH] Add another missing piece to activate bosh editor for cloud-config --- .../org/springframework/ide/vscode/bosh/BoshCliConfig.java | 1 - .../ide/vscode/bosh/BoshCloudConfigSchema.java | 2 +- .../vscode/bosh/models/BoshCommandBasedModelProvider.java | 5 +---- vscode-extensions/vscode-bosh/lib/Main.ts | 7 ++++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java index 65f183ff2..ed221d7c2 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java @@ -41,7 +41,6 @@ public class BoshCliConfig { } public void handleConfigurationChange(Settings newConfig) { - Log.info("BoshCliConfig changed: "+newConfig); this.settings = newConfig; } } diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java index 4ddb329c9..c643e004a 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java @@ -24,9 +24,9 @@ public class BoshCloudConfigSchema extends SchemaSupport implements YamlSchema { public BoshCloudConfigSchema(YTypeFactory f, BoshModels models) { super(f); - this.toplevelType = f.ybean("CloudConfig"); t_any = f.yany("Object"); + this.toplevelType = f.ybean("CloudConfig"); addProp(toplevelType, "azs", t_any); addProp(toplevelType, "networks", t_any); addProp(toplevelType, "vm_types", t_any); diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java index 1e321de26..031d58500 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java @@ -102,15 +102,12 @@ public abstract class BoshCommandBasedModelProvider implements DynamicModelPr } protected String executeCommand(ExternalCommand command) throws Exception { - Log.info("executing cmd: "+command); if (command==null) { throw new IOException("bosh cli based editor features are disabled"); } try { ExternalProcess process = new ExternalProcess(getWorkingDir(), command, true, config.getTimeout()); - Log.info("executing cmd SUCCESS: "+process); - String out = process.getOut(); - return out; + return process.getOut(); } catch (Exception e) { Log.log("executing cmd FAILED", e); throw e; diff --git a/vscode-extensions/vscode-bosh/lib/Main.ts b/vscode-extensions/vscode-bosh/lib/Main.ts index 3f33a2182..088954897 100644 --- a/vscode-extensions/vscode-bosh/lib/Main.ts +++ b/vscode-extensions/vscode-bosh/lib/Main.ts @@ -13,8 +13,6 @@ import {TextDocument, OutputChannel} from 'vscode'; var log_output : OutputChannel = null; -const BOSH_DEPLOYMENT_LANGUAGE_ID = "bosh-deployment-manifest"; - function log(msg : string) { if (log_output) { log_output.append(msg +"\n"); @@ -36,7 +34,10 @@ export function activate(context: VSCode.ExtensionContext) { fatJarFile: 'jars/language-server.jar', jvmHeap: "48m", clientOptions: { - documentSelector: [ BOSH_DEPLOYMENT_LANGUAGE_ID ], + documentSelector: [ + "bosh-deployment-manifest", + "bosh-cloud-config" + ], synchronize: { configurationSection: "bosh" }