development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

extension linter: move when clause validation to contextkey.ts

Browse source
This commit is contained in:
Ulugbek Abdullaev 2023-02-28 13:35:07 +01:00
parent da34f7d462
commit e20027ea9f
2 changed files with 42 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/vs/platform/contextkey/common/contextkey.ts
View file

@ -716,6 +716,33 @@ export class Parser {
}
}
export function validateWhenClauses(whenClauses: string[]): any {
const parser = new Parser({ regexParsingWithErrorRecovery: false }); // we run with no recovery to guide users to use correct regexes
return whenClauses.map(whenClause => {
parser.parse(whenClause);
if (parser.lexingErrors.length > 0) {
return parser.lexingErrors.map((se: LexingError) => ({
errorMessage: se.additionalInfo ?
localize('contextkey.scanner.errorForLinterWithHint', "Unexpected token. Hint: {0}", se.additionalInfo) :
localize('contextkey.scanner.errorForLinter', "Unexpected token."),
offset: se.offset,
length: se.lexeme.length,
}));
} else if (parser.parsingErrors.length > 0) {
return parser.parsingErrors.map((pe: ParsingError) => ({
errorMessage: pe.additionalInfo ? `${pe.message}. ${pe.additionalInfo}` : pe.message,
offset: pe.offset,
length: pe.lexeme.length,
}));
} else {
return [];
}
});
}
export function expressionsAreEqualWithConstantSubstitution(a: ContextKeyExpression | null | undefined, b: ContextKeyExpression | null | undefined): boolean {
const aExpr = a ? a.substituteConstants() : undefined;
const bExpr = b ? b.substituteConstants() : undefined;

69
src/vs/workbench/api/common/extHostApiCommands.ts
View file

@ -3,27 +3,25 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { isFalsyOrEmpty } from 'vs/base/common/arrays';
import { VSBuffer } from 'vs/base/common/buffer';
import { Schemas } from 'vs/base/common/network';
import { URI } from 'vs/base/common/uri';
import type * as vscode from 'vscode';
import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
import * as types from 'vs/workbench/api/common/extHostTypes';
import { IRawColorInfo, IWorkspaceEditDto, ICallHierarchyItemDto, IIncomingCallDto, IOutgoingCallDto, ITypeHierarchyItemDto } from 'vs/workbench/api/common/extHost.protocol';
import { IPosition } from 'vs/editor/common/core/position';
import { IRange } from 'vs/editor/common/core/range';
import * as languages from 'vs/editor/common/languages';
import * as search from 'vs/workbench/contrib/search/common/search';
import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
import { validateWhenClauses } from 'vs/platform/contextkey/common/contextkey';
import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { matchesSomeScheme } from 'vs/platform/opener/common/opener';
import { ICallHierarchyItemDto, IIncomingCallDto, IOutgoingCallDto, IRawColorInfo, ITypeHierarchyItemDto, IWorkspaceEditDto } from 'vs/workbench/api/common/extHost.protocol';
import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
import { CustomCodeAction } from 'vs/workbench/api/common/extHostLanguageFeatures';
import { isFalsyOrEmpty } from 'vs/base/common/arrays';
import { IRange } from 'vs/editor/common/core/range';
import { IPosition } from 'vs/editor/common/core/position';
import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
import * as types from 'vs/workbench/api/common/extHostTypes';
import { TransientCellMetadata, TransientDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { VSBuffer } from 'vs/base/common/buffer';
import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
import { matchesSomeScheme } from 'vs/platform/opener/common/opener';
import { Schemas } from 'vs/base/common/network';
import { Parser, ParsingError } from 'vs/platform/contextkey/common/contextkey';
import { LexingError } from 'vs/platform/contextkey/common/scanner';
import { localize } from 'vs/nls';
import * as search from 'vs/workbench/contrib/search/common/search';
import type * as vscode from 'vscode';
//#region --- NEW world
@ -484,45 +482,8 @@ export class ExtHostApiCommands {
}
private static _registerValidateWhenClausesCommand(commands: ExtHostCommands) {
const whenClauseValidationCommand = '_validateWhenClauses';
commands.registerCommand(false, whenClauseValidationCommand, (...args: any[]): any => {
if (args.length !== 1 || !(args[0] instanceof Array) || args[0].some(whenClause => typeof whenClause !== 'string')) {
throw new Error(`Invalid argument when running '${whenClauseValidationCommand}', received: ${JSON.stringify(args)}`);
}
const whenClauses = args[0];
const parser = new Parser({ regexParsingWithErrorRecovery: false });
return whenClauses.map(whenClause => {
parser.parse(whenClause);
if (parser.lexingErrors.length > 0) {
return parser.lexingErrors.map((se: LexingError) => {
return {
errorMessage: se.additionalInfo ?
localize('contextkey.scanner.errorForLinterWithHint', "Unexpected token. Hint: {0}", se.additionalInfo) :
localize('contextkey.scanner.errorForLinter', "Unexpected token."),
offset: se.offset,
length: se.lexeme.length,
};
});
} else if (parser.parsingErrors.length > 0) {
return parser.parsingErrors.map((pe: ParsingError) => {
return {
errorMessage: pe.additionalInfo ? `${pe.message}. ${pe.additionalInfo}` : pe.message,
offset: pe.offset,
length: pe.lexeme.length,
};
});
} else {
return [];
}
});
});
commands.registerCommand(false, '_validateWhenClauses', validateWhenClauses);
}
}
function tryMapWith<T, R>(f: (x: T) => R) {