Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[json] update proxy on settings update

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-01-26 09:56:43 +01:00
parent 9443432459
commit 4c6534ebc6
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/json/server/src/server.ts
View File

@@ -58,13 +58,6 @@ documents.listen(connection);
let workspaceRoot: URI;
connection.onInitialize((params: InitializeParams): InitializeResult => {
workspaceRoot = URI.parse(params.rootPath);
if (params.initializationOptions) {
let proxy = params.initializationOptions['proxy'];
let proxyStrictSSL = params.initializationOptions['proxyStrictSSL'];
configureHttpRequests(proxy, proxyStrictSSL);
}
return {
capabilities: {
// Tell the client that the server works in FULL text document sync mode
@@ -141,7 +134,11 @@ documents.onDidChangeContent((change) => {
interface Settings {
json: {
schemas: JSONSchemaSettings[]
};
},
http : {
proxy: string,
proxyStrictSSL: boolean
}
}
interface JSONSchemaSettings {
@@ -155,8 +152,10 @@ let schemaAssociations : ISchemaAssociations = void 0;
// The settings have changed. Is send on server activation as well.
connection.onDidChangeConfiguration((change) => {
var jsonSettings = (<Settings>change.settings).json;
jsonConfigurationSettings = jsonSettings && jsonSettings.schemas;
var settings = <Settings>change.settings
configureHttpRequests(settings.http && settings.http.proxy, settings.http && settings.http.proxyStrictSSL);
jsonConfigurationSettings = settings.json && settings.json.schemas;
updateConfiguration();
});