development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #138163 by removing unnecessary deriveFromWorkspaceTrust from some options.

Browse source
This commit is contained in:
Henning Dieterichs 2021-11-30 16:23:25 +01:00
parent 16b9fc761b
commit 585cf37801
No known key found for this signature in database
GPG key ID: 771381EFFDB9EC06
3 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/editor/common/config/editorOptions.ts
View file

@ -3261,8 +3261,8 @@ export const deriveFromWorkspaceTrust: DeriveFromWorkspaceTrust = 'deriveFromWor
*/
export interface IUnicodeHighlightOptions {
nonBasicASCII?: boolean | DeriveFromWorkspaceTrust;
invisibleCharacters?: boolean | DeriveFromWorkspaceTrust;
ambiguousCharacters?: boolean | DeriveFromWorkspaceTrust;
invisibleCharacters?: boolean;
ambiguousCharacters?: boolean;
includeComments?: boolean | DeriveFromWorkspaceTrust;
/**
* A list of allowed code points in a single string.
@ -3290,8 +3290,8 @@ class UnicodeHighlight extends BaseEditorOption<EditorOption.unicodeHighlighting
constructor() {
const defaults: InternalUnicodeHighlightOptions = {
nonBasicASCII: deriveFromWorkspaceTrust,
invisibleCharacters: deriveFromWorkspaceTrust,
ambiguousCharacters: deriveFromWorkspaceTrust,
invisibleCharacters: true,
ambiguousCharacters: true,
includeComments: deriveFromWorkspaceTrust,
allowedCharacters: '',
};
@ -3308,15 +3308,13 @@ class UnicodeHighlight extends BaseEditorOption<EditorOption.unicodeHighlighting
},
[unicodeHighlightConfigKeys.invisibleCharacters]: {
restricted: true,
type: ['boolean', 'string'],
enum: [true, false, deriveFromWorkspaceTrust],
type: 'boolean',
default: defaults.invisibleCharacters,
description: nls.localize('unicodeHighlight.invisibleCharacters', "Controls whether characters that just reserve space or have no width at all are highlighted.")
},
[unicodeHighlightConfigKeys.ambiguousCharacters]: {
restricted: true,
type: ['boolean', 'string'],
enum: [true, false, deriveFromWorkspaceTrust],
type: 'boolean',
default: defaults.ambiguousCharacters,
description: nls.localize('unicodeHighlight.ambiguousCharacters', "Controls whether characters are highlighted that can be confused with basic ASCII characters, except those that are common in the current user locale.")
},
@ -3344,8 +3342,8 @@ class UnicodeHighlight extends BaseEditorOption<EditorOption.unicodeHighlighting
const input = _input as IUnicodeHighlightOptions;
return {
nonBasicASCII: primitiveSet<boolean | DeriveFromWorkspaceTrust>(input.nonBasicASCII, deriveFromWorkspaceTrust, [true, false, deriveFromWorkspaceTrust]),
invisibleCharacters: primitiveSet<boolean | DeriveFromWorkspaceTrust>(input.invisibleCharacters, deriveFromWorkspaceTrust, [true, false, deriveFromWorkspaceTrust]),
ambiguousCharacters: primitiveSet<boolean | DeriveFromWorkspaceTrust>(input.ambiguousCharacters, deriveFromWorkspaceTrust, [true, false, deriveFromWorkspaceTrust]),
invisibleCharacters: boolean(input.invisibleCharacters, this.defaultValue.invisibleCharacters),
ambiguousCharacters: boolean(input.ambiguousCharacters, this.defaultValue.ambiguousCharacters),
includeComments: primitiveSet<boolean | DeriveFromWorkspaceTrust>(input.includeComments, deriveFromWorkspaceTrust, [true, false, deriveFromWorkspaceTrust]),
allowedCharacters: string(input.allowedCharacters, ''),
};

25
src/vs/editor/contrib/unicodeHighlighter/unicodeHighlighter.ts
View file

@ -185,28 +185,11 @@ type RemoveDeriveFromWorkspaceTrust<T> = T extends DeriveFromWorkspaceTrust ? ne
type ResolvedOptions = { [TKey in keyof InternalUnicodeHighlightOptions]: RemoveDeriveFromWorkspaceTrust<InternalUnicodeHighlightOptions[TKey]> };
function resolveOptions(trusted: boolean, options: InternalUnicodeHighlightOptions): ResolvedOptions {
let defaults;
if (trusted) {
defaults = {
nonBasicASCII: false,
ambiguousCharacters: true,
invisibleCharacters: true,
includeComments: false,
};
} else {
defaults = {
nonBasicASCII: true,
ambiguousCharacters: true,
invisibleCharacters: true,
includeComments: true,
};
}
return {
nonBasicASCII: options.nonBasicASCII !== deriveFromWorkspaceTrust ? options.nonBasicASCII : defaults.nonBasicASCII,
ambiguousCharacters: options.ambiguousCharacters !== deriveFromWorkspaceTrust ? options.ambiguousCharacters : defaults.ambiguousCharacters,
invisibleCharacters: options.invisibleCharacters !== deriveFromWorkspaceTrust ? options.invisibleCharacters : defaults.invisibleCharacters,
includeComments: options.includeComments !== deriveFromWorkspaceTrust ? options.includeComments : defaults.includeComments,
nonBasicASCII: options.nonBasicASCII !== deriveFromWorkspaceTrust ? options.nonBasicASCII : !trusted,
ambiguousCharacters: options.ambiguousCharacters,
invisibleCharacters: options.invisibleCharacters,
includeComments: options.includeComments !== deriveFromWorkspaceTrust ? options.includeComments : !trusted,
allowedCharacters: options.allowedCharacters ?? [],
};
}

4
src/vs/monaco.d.ts vendored
View file

@ -3870,8 +3870,8 @@ declare namespace monaco.editor {
*/
export interface IUnicodeHighlightOptions {
nonBasicASCII?: boolean | DeriveFromWorkspaceTrust;
invisibleCharacters?: boolean | DeriveFromWorkspaceTrust;
ambiguousCharacters?: boolean | DeriveFromWorkspaceTrust;
invisibleCharacters?: boolean;
ambiguousCharacters?: boolean;
includeComments?: boolean | DeriveFromWorkspaceTrust;
/**
* A list of allowed code points in a single string.