Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/spring-projects/sts4

Browse Source
This commit is contained in:
BoykoAlex
2017-08-04 19:47:32 -04:00
parent 7aef0043c8 9bfdb0b14a
commit 8ee82802e4
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java
View File

@@ -41,7 +41,6 @@ public class BoshCliConfig {
}
public void handleConfigurationChange(Settings newConfig) {
Log.info("BoshCliConfig changed: "+newConfig);
this.settings = newConfig;
}
}

2
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java
View File

@@ -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);

5
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java
View File

@@ -102,15 +102,12 @@ public abstract class BoshCommandBasedModelProvider<T> 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;

7
vscode-extensions/vscode-bosh/lib/Main.ts
View File

@@ -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"
}