Skip to content

Commit f4a87ac

Browse files
author
Alexander Chen
committed
Added onDidGrantWorkspaceTrust event for downloadExternalResource setting
Signed-off-by: Alexander Chen <alchen@redhat.com>
1 parent ed8e6bb commit f4a87ac

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"xml.extension.jars",
3131
"xml.java.home",
3232
"xml.server.vmargs",
33-
"xml.validation.resolveExternalEntities"
33+
"xml.validation.resolveExternalEntities",
34+
"xml.downloadExternalResources.enabled"
3435
]
3536
}
3637
},

src/client/xmlClient.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ export async function startLanguageClient(context: ExtensionContext, executable:
103103
}
104104
}));
105105

106+
const onDidGrantWorkspaceTrust = (workspace as any).onDidGrantWorkspaceTrust;
107+
if (onDidGrantWorkspaceTrust !== undefined) {
108+
context.subscriptions.push(onDidGrantWorkspaceTrust(() => {
109+
languageClient.sendNotification(DidChangeConfigurationNotification.type, { settings: getXMLSettings(requirementsData.java_home, logfile, externalXmlSettings) });
110+
workspace.getConfiguration('xml').update('downloadExternalResources.enabled', true); //set back to default setting
111+
}));
112+
}
113+
106114
return languageClient;
107115
}
108116

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import * as fs from 'fs-extra';
1414
import * as os from 'os';
1515
import * as path from 'path';
16-
import { ExtensionContext, extensions, languages } from "vscode";
16+
import { commands, ExtensionContext, extensions, languages, workspace } from "vscode";
1717
import { Executable, LanguageClient } from 'vscode-languageclient/node';
1818
import { XMLExtensionApi } from './api/xmlExtensionApi';
1919
import { getXmlExtensionApiImplementation } from './api/xmlExtensionApiImplementation';

0 commit comments

Comments
 (0)