development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-12 21:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up leftover PHP custom trust code

Browse source
This commit is contained in:
Rob Lourens 2021-06-28 08:38:38 -05:00
parent 498aea6ba2
commit b35a791987
3 changed files with 4 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/php-language-features/package.json
View file

@ -68,22 +68,7 @@
"fileMatch": "composer.json",
"url": "https://getcomposer.org/schema.json"
}
],
"commands": [
{
"title": "%command.untrustValidationExecutable%",
"category": "%commands.categroy.php%",
"command": "php.untrustValidationExecutable"
}
],
"menus": {
"commandPalette": [
{
"command": "php.untrustValidationExecutable",
"when": "php.untrustValidationExecutableContext"
}
]
}
]
},
"scripts": {
"compile": "npx gulp compile-extension:php-language-features",

68
extensions/php-language-features/src/features/validationProvider.ts
View file

@ -14,7 +14,6 @@ let localize = nls.loadMessageBundle();
const enum Setting {
Run = 'php.validate.run',
CheckedExecutablePath = 'php.validate.checkedExecutablePath',
Enable = 'php.validate.enable',
ExecutablePath = 'php.validate.executablePath',
}
@ -99,7 +98,7 @@ export default class PHPValidationProvider {
private diagnosticCollection?: vscode.DiagnosticCollection;
private delayers?: { [key: string]: ThrottledDelayer<void> };
constructor(private workspaceStore: vscode.Memento) {
constructor() {
this.validationEnabled = true;
this.pauseValidation = false;
this.loadConfigP = this.loadConfiguration();
@ -115,7 +114,6 @@ export default class PHPValidationProvider {
this.diagnosticCollection!.delete(textDocument.uri);
delete this.delayers![textDocument.uri.toString()];
}, null, subscriptions);
subscriptions.push(vscode.commands.registerCommand('php.untrustValidationExecutable', this.untrustValidationExecutable, this));
}
public dispose(): void {
@ -136,15 +134,6 @@ export default class PHPValidationProvider {
this.config = await getConfig();
if (this.config.executableIsUserDefined !== true && this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined) !== undefined) {
vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true);
}
const trustEnabled = vscode.workspace.getConfiguration().get('security.workspace.trust.enabled');
if (trustEnabled) {
vscode.workspace.requestWorkspaceTrust();
}
this.delayers = Object.create(null);
if (this.pauseValidation) {
this.pauseValidation = oldExecutable === this.config.executable;
@ -167,19 +156,13 @@ export default class PHPValidationProvider {
}
}
private untrustValidationExecutable() {
this.workspaceStore.update(Setting.CheckedExecutablePath, undefined);
vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', false);
}
private async triggerValidate(textDocument: vscode.TextDocument): Promise<void> {
await this.loadConfigP;
if (textDocument.languageId !== 'php' || this.pauseValidation || !this.validationEnabled) {
return;
}
let trigger = () => {
if (vscode.workspace.isTrusted) {
let key = textDocument.uri.toString();
let delayer = this.delayers![key];
if (!delayer) {
@ -187,56 +170,9 @@ export default class PHPValidationProvider {
this.delayers![key] = delayer;
}
delayer.trigger(() => this.doValidate(textDocument));
};
const trustEnabled = vscode.workspace.getConfiguration().get('security.workspace.trust.enabled');
if (trustEnabled) {
if (vscode.workspace.isTrusted) {
trigger();
}
} else {
if (this.config!.executableIsUserDefined !== undefined && !this.config!.executableIsUserDefined) {
const checkedExecutablePath = this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined);
if (!checkedExecutablePath || checkedExecutablePath !== this.config!.executable) {
if (await this.showCustomTrustDialog()) {
this.workspaceStore.update(Setting.CheckedExecutablePath, this.config!.executable);
vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true);
} else {
this.pauseValidation = true;
return;
}
}
}
trigger();
}
}
private async showCustomTrustDialog(): Promise<boolean> {
interface MessageItem extends vscode.MessageItem {
id: string;
}
const selected = await vscode.window.showInformationMessage<MessageItem>(
localize('php.useExecutablePath', 'Do you allow {0} (defined as a workspace setting) to be executed to lint PHP files?', this.config!.executable),
{
title: localize('php.yes', 'Allow'),
id: 'yes'
},
{
title: localize('php.no', 'Disallow'),
isCloseAffordance: true,
id: 'no'
}
);
if (selected && selected.id === 'yes') {
return true;
}
return false;
}
private doValidate(textDocument: vscode.TextDocument): Promise<void> {
return new Promise<void>(async (resolve) => {
const executable = this.config!.executable;

2
extensions/php-language-features/src/phpMain.ts
View file

@ -12,7 +12,7 @@ import PHPValidationProvider from './features/validationProvider';
export function activate(context: vscode.ExtensionContext): any {
let validator = new PHPValidationProvider(context.workspaceState);
let validator = new PHPValidationProvider();
validator.activate(context.subscriptions);
// add providers