', 'javascript', ' return;\n foo(); ');
});
});
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index c467e1ac9b4..2532ccb506a 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -67,12 +67,7 @@ vscode-nls@^5.2.0:
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
-vscode-uri@^3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.4.tgz#703c6dd7c0b727ee1c34a1287434138fb52d054f"
- integrity sha512-aEmKD6H8Sg8gaQAUrnadG0BMeWXtiWhRsj1a94n2FYsMkDpgnK7BRVzZjOUYIvkv2B+bp5Bmt4ImZCpYbnJwkg==
-
-vscode-uri@^3.0.5:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.5.tgz#3dd5a9e154e7c9a40de5eaa450a0ce59b435e584"
- integrity sha512-bBp2pi1o6ynwlnGL8Tt6UBL1w3VsVZtHCU/Sl73bRfqjno3jMcVSCybdY+hj+31A8FQOELZJWwY+shLVLtcNew==
+vscode-uri@^3.0.6, vscode-uri@^3.0.4:
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
+ integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index cfe8b8f7ad1..478e8548591 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -116,10 +116,10 @@ vscode-nls@^5.2.0:
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
-vscode-uri@^3.0.5:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.5.tgz#3dd5a9e154e7c9a40de5eaa450a0ce59b435e584"
- integrity sha512-bBp2pi1o6ynwlnGL8Tt6UBL1w3VsVZtHCU/Sl73bRfqjno3jMcVSCybdY+hj+31A8FQOELZJWwY+shLVLtcNew==
+vscode-uri@^3.0.6:
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
+ integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
yallist@^4.0.0:
version "4.0.0"
diff --git a/extensions/html/package.json b/extensions/html/package.json
index aad035c05cc..238f1348955 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -76,6 +76,12 @@
"meta.tag string.quoted": "other"
}
}
+ ],
+ "snippets": [
+ {
+ "language": "html",
+ "path": "./snippets/html.code-snippets"
+ }
]
},
"repository": {
diff --git a/extensions/html/snippets/html.code-snippets b/extensions/html/snippets/html.code-snippets
new file mode 100644
index 00000000000..62d61b43b7b
--- /dev/null
+++ b/extensions/html/snippets/html.code-snippets
@@ -0,0 +1,18 @@
+{
+ "html doc": {
+ "isFileTemplate": true,
+ "body": [
+ "",
+ "",
+ "",
+ "\t
",
+ "\t
${1:title}",
+ "",
+ "",
+ "\t$0",
+ "",
+ ""
+ ],
+ "description": "HTML Document"
+ }
+}
diff --git a/extensions/image-preview/README.md b/extensions/image-preview/README.md
deleted file mode 100644
index d3f0bd6cb6c..00000000000
--- a/extensions/image-preview/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Image Preview
-
-**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
-
-## Features
-
-This extension provides VS Code's built-in image preview functionality.
-
-Supported image formats:
-
-- `*.jpg`, `*.jpe`, `*.jpeg`
-- `*.png`
-- `*.bmp`
-- `*.gif`
-- `*.ico`
-- `*.webp`
diff --git a/extensions/ini/package.json b/extensions/ini/package.json
index aa98ee3a353..0c7dda3c880 100644
--- a/extensions/ini/package.json
+++ b/extensions/ini/package.json
@@ -27,9 +27,9 @@
{
"id": "properties",
"extensions": [
+ ".conf",
".properties",
".cfg",
- ".conf",
".directory",
".gitattributes",
".gitconfig",
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index 2d10494e412..9facfaa3322 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -13,7 +13,8 @@
"diffContentOptions"
],
"activationEvents": [
- "*"
+ "onNotebook:jupyter-notebook",
+ "onCommand:ipynb.newUntitledIpynb"
],
"extensionKind": [
"workspace",
diff --git a/extensions/ipynb/src/notebookAttachmentCleaner.ts b/extensions/ipynb/src/notebookAttachmentCleaner.ts
index 265c284d984..a72761754df 100644
--- a/extensions/ipynb/src/notebookAttachmentCleaner.ts
+++ b/extensions/ipynb/src/notebookAttachmentCleaner.ts
@@ -153,16 +153,16 @@ export class AttachmentCleaner implements vscode.CodeActionProvider {
this.saveAllAttachmentsToCache(cell.metadata, notebookUri, cellFragment);
}
- if (this.checkMetadataAttachmentsExistence(cell.metadata)) {
+ if (this.checkMetadataHasAttachmentsField(cell.metadata)) {
// the cell metadata contains attachments, check if any are used in the markdown source
- for (const currFilename of Object.keys(cell.metadata.attachments)) {
+ for (const [currFilename, attachment] of Object.entries(cell.metadata.attachments)) {
// means markdown reference is present in the metadata, rendering will work properly
// therefore, we don't need to check it in the next loop either
if (markdownAttachmentsRefedInCell.has(currFilename)) {
// attachment reference is present in the markdown source, no need to cache it
markdownAttachmentsRefedInCell.get(currFilename)!.valid = true;
- markdownAttachmentsInUse[currFilename] = cell.metadata.attachments[currFilename];
+ markdownAttachmentsInUse[currFilename] = attachment as IAttachmentData;
} else {
// attachment reference is not present in the markdown source, cache it
this.saveAttachmentToCache(notebookUri, cellFragment, currFilename, cell.metadata);
@@ -227,7 +227,7 @@ export class AttachmentCleaner implements vscode.CodeActionProvider {
const diagnostics: IAttachmentDiagnostic[] = [];
const markdownAttachments = this.getAttachmentNames(document);
- if (this.checkMetadataAttachmentsExistence(activeCell.metadata)) {
+ if (this.checkMetadataHasAttachmentsField(activeCell.metadata)) {
for (const [currFilename, attachment] of markdownAttachments) {
if (!activeCell.metadata.attachments[currFilename]) {
// no attachment reference in the metadata
@@ -295,8 +295,8 @@ export class AttachmentCleaner implements vscode.CodeActionProvider {
* @param metadata metadata of cell
* @returns boolean representing the presence of any attachments
*/
- private checkMetadataAttachmentsExistence(metadata: { [key: string]: any }): boolean {
- return !!(metadata.attachments);
+ private checkMetadataHasAttachmentsField(metadata: { [key: string]: unknown }): metadata is { readonly attachments: Record
} {
+ return !!metadata.attachments && typeof metadata.attachments === 'object';
}
/**
@@ -305,14 +305,16 @@ export class AttachmentCleaner implements vscode.CodeActionProvider {
* @param notebookUri uri for the notebook being edited
* @param cellFragment fragment of cell being edited
*/
- private saveAllAttachmentsToCache(metadata: { [key: string]: any }, notebookUri: string, cellFragment: string): void {
+ private saveAllAttachmentsToCache(metadata: { [key: string]: unknown }, notebookUri: string, cellFragment: string): void {
const documentCache = this._attachmentCache.get(notebookUri) ?? new Map();
this._attachmentCache.set(notebookUri, documentCache);
const cellCache = documentCache.get(cellFragment) ?? new Map();
documentCache.set(cellFragment, cellCache);
- for (const currFilename of Object.keys(metadata.attachments)) {
- cellCache.set(currFilename, metadata.attachments[currFilename]);
+ if (metadata.attachments && typeof metadata.attachments === 'object') {
+ for (const [currFilename, attachment] of Object.entries(metadata.attachments)) {
+ cellCache.set(currFilename, attachment);
+ }
}
}
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
index f075737b4d8..96da8f2c617 100644
--- a/extensions/ipynb/src/serializers.ts
+++ b/extensions/ipynb/src/serializers.ts
@@ -7,7 +7,6 @@ import type * as nbformat from '@jupyterlab/nbformat';
import { NotebookCell, NotebookCellData, NotebookCellKind, NotebookCellOutput } from 'vscode';
import { CellOutputMetadata } from './common';
import { textMimeTypes } from './deserializers';
-import { compressOutputItemStreams } from './streamCompressor';
const textDecoder = new TextDecoder();
@@ -277,17 +276,21 @@ type JupyterOutput =
function convertStreamOutput(output: NotebookCellOutput): JupyterOutput {
const outputs: string[] = [];
- const compressedStream = output.items.length ? new TextDecoder().decode(compressOutputItemStreams(output.items[0].mime, output.items)) : '';
- // Ensure each line is a separate entry in an array (ending with \n).
- const lines = compressedStream.split('\n');
- // If the last item in `outputs` is not empty and the first item in `lines` is not empty, then concate them.
- // As they are part of the same line.
- if (outputs.length && lines.length && lines[0].length > 0) {
- outputs[outputs.length - 1] = `${outputs[outputs.length - 1]}${lines.shift()!}`;
- }
- for (const line of lines) {
- outputs.push(line);
- }
+ output.items
+ .filter((opit) => opit.mime === CellOutputMimeTypes.stderr || opit.mime === CellOutputMimeTypes.stdout)
+ .map((opit) => textDecoder.decode(opit.data))
+ .forEach(value => {
+ // Ensure each line is a separate entry in an array (ending with \n).
+ const lines = value.split('\n');
+ // If the last item in `outputs` is not empty and the first item in `lines` is not empty, then concate them.
+ // As they are part of the same line.
+ if (outputs.length && lines.length && lines[0].length > 0) {
+ outputs[outputs.length - 1] = `${outputs[outputs.length - 1]}${lines.shift()!}`;
+ }
+ for (const line of lines) {
+ outputs.push(line);
+ }
+ });
for (let index = 0; index < (outputs.length - 1); index++) {
outputs[index] = `${outputs[index]}\n`;
diff --git a/extensions/ipynb/src/streamCompressor.ts b/extensions/ipynb/src/streamCompressor.ts
deleted file mode 100644
index cea3184e16c..00000000000
--- a/extensions/ipynb/src/streamCompressor.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import type { NotebookCellOutputItem } from 'vscode';
-
-
-/**
- * Given a stream of individual stdout outputs, this function will return the compressed lines, escaping some of the common terminal escape codes.
- * E.g. some terminal escape codes would result in the previous line getting cleared, such if we had 3 lines and
- * last line contained such a code, then the result string would be just the first two lines.
- */
-export function compressOutputItemStreams(mimeType: string, outputs: NotebookCellOutputItem[]) {
- // return outputs.find(op => op.mime === mimeType)!.data.buffer;
-
- const buffers: Uint8Array[] = [];
- let startAppending = false;
- // Pick the first set of outputs with the same mime type.
- for (const output of outputs) {
- if (output.mime === mimeType) {
- if ((buffers.length === 0 || startAppending)) {
- buffers.push(output.data);
- startAppending = true;
- }
- } else if (startAppending) {
- startAppending = false;
- }
- }
- compressStreamBuffer(buffers);
- const totalBytes = buffers.reduce((p, c) => p + c.byteLength, 0);
- const combinedBuffer = new Uint8Array(totalBytes);
- let offset = 0;
- for (const buffer of buffers) {
- combinedBuffer.set(buffer, offset);
- offset = offset + buffer.byteLength;
- }
- return combinedBuffer;
-}
-const MOVE_CURSOR_1_LINE_COMMAND = `${String.fromCharCode(27)}[A`;
-const MOVE_CURSOR_1_LINE_COMMAND_BYTES = MOVE_CURSOR_1_LINE_COMMAND.split('').map(c => c.charCodeAt(0));
-const LINE_FEED = 10;
-function compressStreamBuffer(streams: Uint8Array[]) {
- streams.forEach((stream, index) => {
- if (index === 0 || stream.length < MOVE_CURSOR_1_LINE_COMMAND.length) {
- return;
- }
-
- const previousStream = streams[index - 1];
-
- // Remove the previous line if required.
- const command = stream.subarray(0, MOVE_CURSOR_1_LINE_COMMAND.length);
- if (command[0] === MOVE_CURSOR_1_LINE_COMMAND_BYTES[0] && command[1] === MOVE_CURSOR_1_LINE_COMMAND_BYTES[1] && command[2] === MOVE_CURSOR_1_LINE_COMMAND_BYTES[2]) {
- const lastIndexOfLineFeed = previousStream.lastIndexOf(LINE_FEED);
- if (lastIndexOfLineFeed === -1) {
- return;
- }
- streams[index - 1] = previousStream.subarray(0, lastIndexOfLineFeed);
- streams[index] = stream.subarray(MOVE_CURSOR_1_LINE_COMMAND.length);
- }
- });
- return streams;
-}
diff --git a/extensions/jake/package.json b/extensions/jake/package.json
index 5ffa78e3981..4e6a94a8b24 100644
--- a/extensions/jake/package.json
+++ b/extensions/jake/package.json
@@ -17,7 +17,7 @@
"watch": "gulp watch-extension:jake"
},
"dependencies": {
- "vscode-nls": "^5.1.0"
+ "vscode-nls": "^5.2.0"
},
"devDependencies": {
"@types/node": "16.x"
diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock
index 90475ddc7e0..8b8c7a6c15b 100644
--- a/extensions/jake/yarn.lock
+++ b/extensions/jake/yarn.lock
@@ -7,7 +7,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 1695f820fcc..ed2e78282ca 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
- "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
+ "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
"name": "JavaScript (with React support)",
"scopeName": "source.js",
"patterns": [
@@ -2674,7 +2674,7 @@
{
"name": "meta.object.member.js meta.object-literal.key.js",
"begin": "(?=[\\'\\\"\\`])",
- "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as)\\s+))))",
+ "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
"patterns": [
{
"include": "#comment"
@@ -2687,7 +2687,7 @@
{
"name": "meta.object.member.js meta.object-literal.key.js",
"begin": "(?x)(?=(\\b(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((? {
cachedElements.push({ element: element as HTMLElement, line });
}
}
- console.log(cachedElements);
}
return cachedElements;
};
diff --git a/extensions/markdown-language-features/server/README.md b/extensions/markdown-language-features/server/README.md
index 761baf37719..6b6e0b0c81c 100644
--- a/extensions/markdown-language-features/server/README.md
+++ b/extensions/markdown-language-features/server/README.md
@@ -64,8 +64,12 @@ The server supports the following settings:
- `enabled` — Enable/disable validation of links to fragments in the current files: `[text](#head)`
- `fileLinks`
- `enabled` — Enable/disable validation of links to file in the workspace.
- - `markdownFragmentLinks` — Enable/disable validation of links to headers in other Markdown files.
+ - `markdownFragmentLinks` — Enable/disable validation of links to headers in other Markdown files. Use `inherit` to inherit the `fragmentLinks` setting.
- `ignoredLinks` — Array of glob patterns for files that should not be validated.
+ - `unusedLinkDefinitions`
+ - `enabled` — Enable/disable validation of unused link definitions.
+ - `duplicateLinkDefinitions`
+ - `enabled` — Enable/disable validation of duplicated link definitions.
### Custom requests
diff --git a/extensions/markdown-language-features/server/package.json b/extensions/markdown-language-features/server/package.json
index c38c618f05d..a5322a81c4a 100644
--- a/extensions/markdown-language-features/server/package.json
+++ b/extensions/markdown-language-features/server/package.json
@@ -13,8 +13,8 @@
"vscode-languageserver": "^8.0.2",
"vscode-languageserver-textdocument": "^1.0.5",
"vscode-languageserver-types": "^3.17.1",
- "vscode-markdown-languageservice": "^0.1.0-alpha.10",
- "vscode-nls": "^5.0.1",
+ "vscode-markdown-languageservice": "^0.2.0-alpha.2",
+ "vscode-nls": "^5.2.0",
"vscode-uri": "^3.0.3"
},
"devDependencies": {
diff --git a/extensions/markdown-language-features/server/src/configuration.ts b/extensions/markdown-language-features/server/src/configuration.ts
index 69358261f82..b521e478605 100644
--- a/extensions/markdown-language-features/server/src/configuration.ts
+++ b/extensions/markdown-language-features/server/src/configuration.ts
@@ -6,7 +6,7 @@
import { Connection, Emitter } from 'vscode-languageserver';
import { Disposable } from './util/dispose';
-export type ValidateEnabled = 'ignore' | 'warning' | 'error';
+export type ValidateEnabled = 'ignore' | 'warning' | 'error' | 'hint';
interface Settings {
readonly markdown: {
@@ -26,9 +26,15 @@ interface Settings {
};
readonly fileLinks: {
readonly enabled: ValidateEnabled;
- readonly markdownFragmentLinks: ValidateEnabled;
+ readonly markdownFragmentLinks: ValidateEnabled | 'inherit';
};
readonly ignoredLinks: readonly string[];
+ readonly unusedLinkDefinitions: {
+ readonly enabled: ValidateEnabled;
+ };
+ readonly duplicateLinkDefinitions: {
+ readonly enabled: ValidateEnabled;
+ };
};
};
}
diff --git a/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
index d0f4d9c73af..0f7e6954dbc 100644
--- a/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
+++ b/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
@@ -15,6 +15,8 @@ const defaultDiagnosticOptions: md.DiagnosticOptions = {
validateReferences: md.DiagnosticLevel.ignore,
validateFragmentLinks: md.DiagnosticLevel.ignore,
validateMarkdownFileLinkFragments: md.DiagnosticLevel.ignore,
+ validateUnusedLinkDefinitions: md.DiagnosticLevel.ignore,
+ validateDuplicateLinkDefinitions: md.DiagnosticLevel.ignore,
ignoreLinks: [],
};
@@ -23,6 +25,7 @@ function convertDiagnosticLevel(enabled: ValidateEnabled): md.DiagnosticLevel |
case 'error': return md.DiagnosticLevel.error;
case 'warning': return md.DiagnosticLevel.warning;
case 'ignore': return md.DiagnosticLevel.ignore;
+ case 'hint': return md.DiagnosticLevel.hint;
default: return md.DiagnosticLevel.ignore;
}
}
@@ -33,11 +36,14 @@ function getDiagnosticsOptions(config: ConfigurationManager): md.DiagnosticOptio
return defaultDiagnosticOptions;
}
+ const validateFragmentLinks = convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled);
return {
validateFileLinks: convertDiagnosticLevel(settings.markdown.validate.fileLinks.enabled),
validateReferences: convertDiagnosticLevel(settings.markdown.validate.referenceLinks.enabled),
validateFragmentLinks: convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled),
- validateMarkdownFileLinkFragments: convertDiagnosticLevel(settings.markdown.validate.fileLinks.markdownFragmentLinks),
+ validateMarkdownFileLinkFragments: settings.markdown.validate.fileLinks.markdownFragmentLinks === 'inherit' ? validateFragmentLinks : convertDiagnosticLevel(settings.markdown.validate.fileLinks.markdownFragmentLinks),
+ validateUnusedLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.unusedLinkDefinitions.enabled),
+ validateDuplicateLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.duplicateLinkDefinitions.enabled),
ignoreLinks: settings.markdown.validate.ignoredLinks,
};
}
diff --git a/extensions/markdown-language-features/server/src/server.ts b/extensions/markdown-language-features/server/src/server.ts
index 95a088b439b..c17a32a63ee 100644
--- a/extensions/markdown-language-features/server/src/server.ts
+++ b/extensions/markdown-language-features/server/src/server.ts
@@ -93,6 +93,7 @@ export async function startServer(connection: Connection, serverConfig: {
completionProvider: { triggerCharacters: ['.', '/', '#'] },
definitionProvider: true,
documentLinkProvider: { resolveProvider: true },
+ documentHighlightProvider: false, // TODO: Disabling for now
documentSymbolProvider: true,
foldingRangeProvider: true,
referencesProvider: true,
@@ -232,6 +233,14 @@ export async function startServer(connection: Connection, serverConfig: {
return codeAction;
});
+ connection.onDocumentHighlight(async (params, token) => {
+ const document = documents.get(params.textDocument.uri);
+ if (!document) {
+ return undefined;
+ }
+ return mdLs!.getDocumentHighlights(document, params.position, token);
+ });
+
connection.onRequest(protocol.getReferencesToFileInWorkspace, (async (params: { uri: string }, token: CancellationToken) => {
return mdLs!.getFileReferences(URI.parse(params.uri), token);
}));
diff --git a/extensions/markdown-language-features/server/yarn.lock b/extensions/markdown-language-features/server/yarn.lock
index 00347dd2bd8..f9067270e01 100644
--- a/extensions/markdown-language-features/server/yarn.lock
+++ b/extensions/markdown-language-features/server/yarn.lock
@@ -42,10 +42,10 @@ vscode-languageserver@^8.0.2:
dependencies:
vscode-languageserver-protocol "3.17.2"
-vscode-markdown-languageservice@^0.1.0-alpha.10:
- version "0.1.0-alpha.10"
- resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.1.0-alpha.10.tgz#012dcf600b9d1a738cd7071f17627285342d17c7"
- integrity sha512-GZTxGZp49BIf/k5plc5x+Bp70kmwaTdt523p+wifG9AQ0uKMSRcwmlKu8mOcJUd0ZvDR3ORI/Cze90Dy5HCM2A==
+vscode-markdown-languageservice@^0.2.0-alpha.2:
+ version "0.2.0-alpha.2"
+ resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0-alpha.2.tgz#ed08bc3f7f19c5fb0283547a7855542224ce377c"
+ integrity sha512-2/Mp/b63ohC8k0h1boWohf2G6SwLb3IA+c3UcqPs4FdaRpGqpf2wVXaT5aQ5qVRGpqvCwfyyyr2YEdqwuQc5KA==
dependencies:
picomatch "^2.3.1"
vscode-languageserver-textdocument "^1.0.5"
@@ -53,7 +53,7 @@ vscode-markdown-languageservice@^0.1.0-alpha.10:
vscode-nls "^5.0.1"
vscode-uri "^3.0.3"
-vscode-nls@^5.0.1:
+vscode-nls@^5.0.1, vscode-nls@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
index b1c06b85f9f..46ed49f3c4b 100644
--- a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
@@ -21,10 +21,7 @@ export class FindFileReferencesCommand implements Command {
) { }
public async execute(resource?: vscode.Uri) {
- if (!resource) {
- resource = vscode.window.activeTextEditor?.document.uri;
- }
-
+ resource ??= vscode.window.activeTextEditor?.document.uri;
if (!resource) {
vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided."));
return;
diff --git a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
index cfe16893b39..0b50ed4fc80 100644
--- a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
@@ -18,9 +18,9 @@ import { convertRange } from './fileReferences';
const localize = nls.loadMessageBundle();
const settingNames = Object.freeze({
- enabled: 'experimental.updateLinksOnFileMove.enabled',
- externalFileGlobs: 'experimental.updateLinksOnFileMove.externalFileGlobs',
- enableForDirectories: 'experimental.updateLinksOnFileMove.enableForDirectories',
+ enabled: 'updateLinksOnFileMove.enabled',
+ externalFileGlobs: 'updateLinksOnFileMove.externalFileGlobs',
+ enableForDirectories: 'updateLinksOnFileMove.enableForDirectories',
});
const enum UpdateLinksOnFileMoveSetting {
@@ -45,14 +45,11 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
super();
this._register(vscode.workspace.onDidRenameFiles(async (e) => {
- for (const { newUri, oldUri } of e.files) {
- const config = vscode.workspace.getConfiguration('markdown', newUri);
- if (!await this.shouldParticipateInLinkUpdate(config, newUri)) {
- continue;
+ await Promise.all(e.files.map(async (rename) => {
+ if (await this.shouldParticipateInLinkUpdate(rename.newUri)) {
+ this._pendingRenames.add(rename);
}
-
- this._pendingRenames.add({ newUri, oldUri });
- }
+ }));
if (this._pendingRenames.size) {
this._delayer.trigger(() => {
@@ -95,7 +92,8 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
return false;
}
}
- private async shouldParticipateInLinkUpdate(config: vscode.WorkspaceConfiguration, newUri: vscode.Uri): Promise {
+ private async shouldParticipateInLinkUpdate(newUri: vscode.Uri): Promise {
+ const config = vscode.workspace.getConfiguration('markdown', newUri);
const setting = config.get(settingNames.enabled);
if (setting === UpdateLinksOnFileMoveSetting.Never) {
return false;
@@ -123,50 +121,38 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
return false;
}
- const enum Choice {
- None = 0,
- Accept = 1,
- Reject = 2,
- Always = 3,
- Never = 4,
- }
+ const rejectItem: vscode.MessageItem = {
+ title: localize('reject.title', "No"),
+ isCloseAffordance: true,
+ };
- interface Item extends vscode.MessageItem {
- readonly choice: Choice;
- }
+ const acceptItem: vscode.MessageItem = {
+ title: localize('accept.title', "Yes"),
+ };
- const response = await vscode.window.showInformationMessage- (
+ const alwaysItem: vscode.MessageItem = {
+ title: localize('always.title', "Always automatically update Markdown Links"),
+ };
+
+ const neverItem: vscode.MessageItem = {
+ title: localize('never.title', "Never automatically update Markdown Links"),
+ };
+
+ const choice = await vscode.window.showInformationMessage(
newResources.length === 1
? localize('prompt', "Update Markdown links for '{0}'?", path.basename(newResources[0].fsPath))
: this.getConfirmMessage(localize('promptMoreThanOne', "Update Markdown link for the following {0} files?", newResources.length), newResources), {
modal: true,
- }, {
- title: localize('reject.title', "No"),
- choice: Choice.Reject,
- isCloseAffordance: true,
- }, {
- title: localize('accept.title', "Yes"),
- choice: Choice.Accept,
- }, {
- title: localize('always.title', "Always automatically update Markdown Links"),
- choice: Choice.Always,
- }, {
- title: localize('never.title', "Never automatically update Markdown Links"),
- choice: Choice.Never,
- });
+ }, rejectItem, acceptItem, alwaysItem, neverItem);
- if (!response) {
- return false;
- }
-
- switch (response.choice) {
- case Choice.Accept: {
+ switch (choice) {
+ case acceptItem: {
return true;
}
- case Choice.Reject: {
+ case rejectItem: {
return false;
}
- case Choice.Always: {
+ case alwaysItem: {
const config = vscode.workspace.getConfiguration('markdown', newResources[0]);
config.update(
settingNames.enabled,
@@ -174,7 +160,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
this.getConfigTargetScope(config, settingNames.enabled));
return true;
}
- case Choice.Never: {
+ case neverItem: {
const config = vscode.workspace.getConfiguration('markdown', newResources[0]);
config.update(
settingNames.enabled,
@@ -182,9 +168,10 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
this.getConfigTargetScope(config, settingNames.enabled));
return false;
}
+ default: {
+ return false;
+ }
}
-
- return false;
}
private async getEditsForFileRename(renames: readonly RenameAction[], token: vscode.CancellationToken): Promise<{ edit: vscode.WorkspaceEdit; resourcesBeingRenamed: vscode.Uri[] } | undefined> {
@@ -241,6 +228,6 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
}
}
-export function registerUpdateLinksOnRename(client: MdLanguageClient) {
+export function registerUpdateLinksOnRename(client: MdLanguageClient): vscode.Disposable {
return new UpdateLinksOnFileRenameHandler(client);
}
diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index 2f9a9732d58..d296fed655d 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -35,9 +35,7 @@ export class VsCodeOutputLogger extends Disposable implements ILogger {
private _outputChannel?: vscode.OutputChannel;
private get outputChannel() {
- if (!this._outputChannel) {
- this._outputChannel = this._register(vscode.window.createOutputChannel('Markdown'));
- }
+ this._outputChannel ??= this._register(vscode.window.createOutputChannel('Markdown'));
return this._outputChannel;
}
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
index cd6dfeb4260..0c768d0d48e 100644
--- a/extensions/markdown-language-features/src/markdownExtensions.ts
+++ b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -144,9 +144,7 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
public readonly onContributionsChanged = this._onContributionsChanged.event;
public get contributions(): MarkdownContributions {
- if (!this._contributions) {
- this._contributions = this.getCurrentContributions();
- }
+ this._contributions ??= this.getCurrentContributions();
return this._contributions;
}
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 26f94614ad8..51348bd7128 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -158,7 +158,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
this._register(watcher.onDidChange(uri => {
if (this.isPreviewOf(uri)) {
// Only use the file system event when VS Code does not already know about the file
- if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() !== uri.toString())) {
+ if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())) {
this.refresh();
}
}
diff --git a/extensions/markdown-language-features/src/preview/previewManager.ts b/extensions/markdown-language-features/src/preview/previewManager.ts
index 50196ac882e..9e32e954c92 100644
--- a/extensions/markdown-language-features/src/preview/previewManager.ts
+++ b/extensions/markdown-language-features/src/preview/previewManager.ts
@@ -42,8 +42,9 @@ class PreviewStore extends Disposable {
}
public get(resource: vscode.Uri, previewSettings: DynamicPreviewSettings): T | undefined {
+ const previewColumn = this.resolvePreviewColumn(previewSettings);
for (const preview of this._previews) {
- if (preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.locked)) {
+ if (preview.matchesResource(resource, previewColumn, previewSettings.locked)) {
return preview;
}
}
@@ -57,6 +58,18 @@ class PreviewStore extends Disposable {
public delete(preview: T) {
this._previews.delete(preview);
}
+
+ private resolvePreviewColumn(previewSettings: DynamicPreviewSettings): vscode.ViewColumn | undefined {
+ if (previewSettings.previewColumn === vscode.ViewColumn.Active) {
+ return vscode.window.tabGroups.activeTabGroup.viewColumn;
+ }
+
+ if (previewSettings.previewColumn === vscode.ViewColumn.Beside) {
+ return vscode.window.tabGroups.activeTabGroup.viewColumn + 1;
+ }
+
+ return previewSettings.previewColumn;
+ }
}
export class MarkdownPreviewManager extends Disposable implements vscode.WebviewPanelSerializer, vscode.CustomTextEditorProvider {
diff --git a/extensions/markdown-language-features/src/test/documentLink.test.ts b/extensions/markdown-language-features/src/test/documentLink.test.ts
index 37fe52e3dfb..0000069a660 100644
--- a/extensions/markdown-language-features/src/test/documentLink.test.ts
+++ b/extensions/markdown-language-features/src/test/documentLink.test.ts
@@ -134,7 +134,7 @@ async function getLinksForFile(file: vscode.Uri): Promise
}
});
- test('Should navigate to fragment within current untitled file', async () => { // TODO: skip for now for ls migration
+ test.skip('Should navigate to fragment within current untitled file', async () => { // TODO: skip for now for ls migration
const testFile = workspaceFile('x.md').with({ scheme: 'untitled' });
await withFileContents(testFile, joinLines(
'[](#second)',
@@ -169,9 +169,8 @@ async function withFileContents(file: vscode.Uri, contents: string): Promise {
});
});
- suite.only('image-caching', () => {
+ suite('image-caching', () => {
const input = ' [](no-img.png)   ';
test('Extracts all images', async () => {
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index 5ffe3ff4b82..6bd778ed899 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -258,10 +258,10 @@ vscode-nls@^5.0.1:
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2"
integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
vscode-uri@^3.0.3:
version "3.0.3"
diff --git a/extensions/image-preview/.vscodeignore b/extensions/media-preview/.vscodeignore
similarity index 100%
rename from extensions/image-preview/.vscodeignore
rename to extensions/media-preview/.vscodeignore
diff --git a/extensions/media-preview/README.md b/extensions/media-preview/README.md
new file mode 100644
index 00000000000..30bb44b87a1
--- /dev/null
+++ b/extensions/media-preview/README.md
@@ -0,0 +1,29 @@
+# Media Preview
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+This extension provides basic preview for images, audio and video files.
+
+### Supported image file extensions
+
+- `.jpg`, `.jpe`, `.jpeg`
+- `.png`
+- `.bmp`
+- `.gif`
+- `.ico`
+- `.webp`
+- `.avif`
+
+
+### Supported audio formats
+
+- `.mp3`
+- `.wav`
+- `.ogg`
+
+### Supported video formats
+
+- `.mp4` (does not support `aac` audio track)
+- `.webm` (vp8 only)
diff --git a/extensions/image-preview/extension-browser.webpack.config.js b/extensions/media-preview/extension-browser.webpack.config.js
similarity index 100%
rename from extensions/image-preview/extension-browser.webpack.config.js
rename to extensions/media-preview/extension-browser.webpack.config.js
diff --git a/extensions/image-preview/extension.webpack.config.js b/extensions/media-preview/extension.webpack.config.js
similarity index 100%
rename from extensions/image-preview/extension.webpack.config.js
rename to extensions/media-preview/extension.webpack.config.js
diff --git a/extensions/image-preview/icon.png b/extensions/media-preview/icon.png
similarity index 100%
rename from extensions/image-preview/icon.png
rename to extensions/media-preview/icon.png
diff --git a/extensions/image-preview/media/audioPreview.css b/extensions/media-preview/media/audioPreview.css
similarity index 100%
rename from extensions/image-preview/media/audioPreview.css
rename to extensions/media-preview/media/audioPreview.css
diff --git a/extensions/image-preview/media/audioPreview.js b/extensions/media-preview/media/audioPreview.js
similarity index 100%
rename from extensions/image-preview/media/audioPreview.js
rename to extensions/media-preview/media/audioPreview.js
diff --git a/extensions/image-preview/media/imagePreview.css b/extensions/media-preview/media/imagePreview.css
similarity index 100%
rename from extensions/image-preview/media/imagePreview.css
rename to extensions/media-preview/media/imagePreview.css
diff --git a/extensions/image-preview/media/imagePreview.js b/extensions/media-preview/media/imagePreview.js
similarity index 100%
rename from extensions/image-preview/media/imagePreview.js
rename to extensions/media-preview/media/imagePreview.js
diff --git a/extensions/image-preview/media/loading-dark.svg b/extensions/media-preview/media/loading-dark.svg
similarity index 100%
rename from extensions/image-preview/media/loading-dark.svg
rename to extensions/media-preview/media/loading-dark.svg
diff --git a/extensions/image-preview/media/loading-hc.svg b/extensions/media-preview/media/loading-hc.svg
similarity index 100%
rename from extensions/image-preview/media/loading-hc.svg
rename to extensions/media-preview/media/loading-hc.svg
diff --git a/extensions/image-preview/media/loading.svg b/extensions/media-preview/media/loading.svg
similarity index 100%
rename from extensions/image-preview/media/loading.svg
rename to extensions/media-preview/media/loading.svg
diff --git a/extensions/image-preview/media/videoPreview.css b/extensions/media-preview/media/videoPreview.css
similarity index 100%
rename from extensions/image-preview/media/videoPreview.css
rename to extensions/media-preview/media/videoPreview.css
diff --git a/extensions/image-preview/media/videoPreview.js b/extensions/media-preview/media/videoPreview.js
similarity index 98%
rename from extensions/image-preview/media/videoPreview.js
rename to extensions/media-preview/media/videoPreview.js
index a8f1f6955fd..54aa60ad86f 100644
--- a/extensions/image-preview/media/videoPreview.js
+++ b/extensions/media-preview/media/videoPreview.js
@@ -30,6 +30,7 @@
if (settings.src !== null) {
video.src = settings.src;
}
+ video.playsInline = true;
video.controls = true;
function onLoaded() {
diff --git a/extensions/image-preview/package.json b/extensions/media-preview/package.json
similarity index 89%
rename from extensions/image-preview/package.json
rename to extensions/media-preview/package.json
index 03c2784a533..384ab75f58b 100644
--- a/extensions/image-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -1,5 +1,5 @@
{
- "name": "image-preview",
+ "name": "media-preview",
"displayName": "%displayName%",
"description": "%description%",
"extensionKind": [
@@ -12,7 +12,7 @@
"license": "MIT",
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"engines": {
- "vscode": "^1.39.0"
+ "vscode": "^1.70.0"
},
"main": "./out/extension",
"browser": "./dist/browser/extension.js",
@@ -50,7 +50,7 @@
"priority": "builtin",
"selector": [
{
- "filenamePattern": "*.{mp3,wav,opus,aac}"
+ "filenamePattern": "*.{mp3,wav,ogg}"
}
]
},
@@ -93,16 +93,16 @@
}
},
"scripts": {
- "compile": "gulp compile-extension:image-preview",
- "watch": "npm run build-preview && gulp watch-extension:image-preview",
+ "compile": "gulp compile-extension:media-preview",
+ "watch": "npm run build-preview && gulp watch-extension:media-preview",
"vscode:prepublish": "npm run build-ext",
- "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:image-preview ./tsconfig.json",
+ "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:media-preview ./tsconfig.json",
"compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
"watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
},
"dependencies": {
"@vscode/extension-telemetry": "0.6.2",
- "vscode-nls": "^5.1.0"
+ "vscode-nls": "^5.2.0"
},
"repository": {
"type": "git",
diff --git a/extensions/image-preview/package.nls.json b/extensions/media-preview/package.nls.json
similarity index 67%
rename from extensions/image-preview/package.nls.json
rename to extensions/media-preview/package.nls.json
index 423aaf0c82b..3e45e4d0d2e 100644
--- a/extensions/image-preview/package.nls.json
+++ b/extensions/media-preview/package.nls.json
@@ -1,6 +1,6 @@
{
- "displayName": "Image Preview",
- "description": "Provides VS Code's built-in image preview",
+ "displayName": "Media Preview",
+ "description": "Provides VS Code's built-in previews for images, audio, and video",
"customEditor.audioPreview.displayName": "Audio Preview",
"customEditor.imagePreview.displayName": "Image Preview",
"customEditor.videoPreview.displayName": "Video Preview",
diff --git a/extensions/image-preview/src/audioPreview.ts b/extensions/media-preview/src/audioPreview.ts
similarity index 100%
rename from extensions/image-preview/src/audioPreview.ts
rename to extensions/media-preview/src/audioPreview.ts
diff --git a/extensions/image-preview/src/binarySizeStatusBarEntry.ts b/extensions/media-preview/src/binarySizeStatusBarEntry.ts
similarity index 100%
rename from extensions/image-preview/src/binarySizeStatusBarEntry.ts
rename to extensions/media-preview/src/binarySizeStatusBarEntry.ts
diff --git a/extensions/image-preview/src/extension.ts b/extensions/media-preview/src/extension.ts
similarity index 100%
rename from extensions/image-preview/src/extension.ts
rename to extensions/media-preview/src/extension.ts
diff --git a/extensions/image-preview/src/imagePreview/index.ts b/extensions/media-preview/src/imagePreview/index.ts
similarity index 100%
rename from extensions/image-preview/src/imagePreview/index.ts
rename to extensions/media-preview/src/imagePreview/index.ts
diff --git a/extensions/image-preview/src/imagePreview/sizeStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts
similarity index 100%
rename from extensions/image-preview/src/imagePreview/sizeStatusBarEntry.ts
rename to extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts
diff --git a/extensions/image-preview/src/imagePreview/zoomStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts
similarity index 100%
rename from extensions/image-preview/src/imagePreview/zoomStatusBarEntry.ts
rename to extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts
diff --git a/extensions/image-preview/src/mediaPreview.ts b/extensions/media-preview/src/mediaPreview.ts
similarity index 100%
rename from extensions/image-preview/src/mediaPreview.ts
rename to extensions/media-preview/src/mediaPreview.ts
diff --git a/extensions/image-preview/src/ownedStatusBarEntry.ts b/extensions/media-preview/src/ownedStatusBarEntry.ts
similarity index 100%
rename from extensions/image-preview/src/ownedStatusBarEntry.ts
rename to extensions/media-preview/src/ownedStatusBarEntry.ts
diff --git a/extensions/image-preview/src/util/dispose.ts b/extensions/media-preview/src/util/dispose.ts
similarity index 100%
rename from extensions/image-preview/src/util/dispose.ts
rename to extensions/media-preview/src/util/dispose.ts
diff --git a/extensions/image-preview/src/util/dom.ts b/extensions/media-preview/src/util/dom.ts
similarity index 100%
rename from extensions/image-preview/src/util/dom.ts
rename to extensions/media-preview/src/util/dom.ts
diff --git a/extensions/image-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts
similarity index 100%
rename from extensions/image-preview/src/videoPreview.ts
rename to extensions/media-preview/src/videoPreview.ts
diff --git a/extensions/image-preview/tsconfig.json b/extensions/media-preview/tsconfig.json
similarity index 100%
rename from extensions/image-preview/tsconfig.json
rename to extensions/media-preview/tsconfig.json
diff --git a/extensions/image-preview/yarn.lock b/extensions/media-preview/yarn.lock
similarity index 92%
rename from extensions/image-preview/yarn.lock
rename to extensions/media-preview/yarn.lock
index 61a6bb946db..a9af1f07de4 100644
--- a/extensions/image-preview/yarn.lock
+++ b/extensions/media-preview/yarn.lock
@@ -46,7 +46,7 @@
"@microsoft/1ds-core-js" "^3.2.3"
"@microsoft/1ds-post-js" "^3.2.3"
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 978341508f8..caba136ce52 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -166,7 +166,7 @@
}
},
"dependencies": {
- "vscode-nls": "^5.1.0"
+ "vscode-nls": "^5.2.0"
},
"devDependencies": {
"@types/node": "16.x"
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index 90475ddc7e0..8b8c7a6c15b 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -7,7 +7,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 07f803a5930..1fb6e7d83a5 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -61,8 +61,7 @@
"sha.js": "2.4.11",
"stream": "0.0.2",
"uuid": "^8.2.0",
- "@vscode/extension-telemetry": "0.6.2",
- "vscode-nls": "^5.1.0"
+ "@vscode/extension-telemetry": "0.6.2"
},
"repository": {
"type": "git",
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
index 288157ba00d..3a7307a47c0 100644
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -7,7 +7,6 @@ import * as randomBytes from 'randombytes';
import * as querystring from 'querystring';
import { Buffer } from 'buffer';
import * as vscode from 'vscode';
-import * as nls from 'vscode-nls';
import { v4 as uuid } from 'uuid';
import fetch, { Response } from 'node-fetch';
import Logger from './logger';
@@ -17,8 +16,6 @@ import { BetterTokenStorage, IDidChangeInOtherWindowEvent } from './betterSecret
import { LoopbackAuthServer } from './authServer';
import path = require('path');
-const localize = nls.loadMessageBundle();
-
const redirectUrl = 'https://vscode.dev/redirect';
const loginEndpointUrl = 'https://login.microsoftonline.com/';
const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
@@ -139,7 +136,7 @@ export class AzureActiveDirectoryService {
sessionId: session.id
});
} else {
- vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed."));
+ vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
Logger.error(e);
await this.removeSessionByIToken({
accessToken: undefined,
@@ -446,7 +443,7 @@ export class AzureActiveDirectoryService {
onDidChangeSessions.fire({ added: [], removed: [], changed: [this.convertToSessionSync(refreshedToken)] });
} catch (e) {
if (e.message !== REFRESH_NETWORK_FAILURE) {
- vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed."));
+ vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
await this.removeSessionById(sessionId);
}
}
@@ -683,9 +680,9 @@ export class AzureActiveDirectoryService {
private async handleCodeInputBox(inputBox: vscode.InputBox, verifier: string, scopeData: IScopeData): Promise {
inputBox.ignoreFocusOut = true;
- inputBox.title = localize('pasteCodeTitle', 'Microsoft Authentication');
- inputBox.prompt = localize('pasteCodePrompt', 'Provide the authorization code to complete the sign in flow.');
- inputBox.placeholder = localize('pasteCodePlaceholder', 'Paste authorization code here...');
+ inputBox.title = vscode.l10n.t('Microsoft Authentication');
+ inputBox.prompt = vscode.l10n.t('Provide the authorization code to complete the sign in flow.');
+ inputBox.placeholder = vscode.l10n.t('Paste authorization code here...');
return new Promise((resolve: (value: vscode.AuthenticationSession) => void, reject) => {
inputBox.show();
inputBox.onDidAccept(async () => {
@@ -829,7 +826,7 @@ export class AzureActiveDirectoryService {
} catch (e) {
// Network failures will automatically retry on next poll.
if (e.message !== REFRESH_NETWORK_FAILURE) {
- vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed."));
+ vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
await this.removeSessionById(session.id);
}
return;
diff --git a/extensions/microsoft-authentication/src/logger.ts b/extensions/microsoft-authentication/src/logger.ts
index 92b5876e1b4..38ae6c732d6 100644
--- a/extensions/microsoft-authentication/src/logger.ts
+++ b/extensions/microsoft-authentication/src/logger.ts
@@ -5,5 +5,5 @@
import * as vscode from 'vscode';
-const Logger = vscode.window.createOutputChannel('Microsoft Authentication', { log: true });
+const Logger = vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Authentication'), { log: true });
export default Logger;
diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock
index 6706f6a4aae..d66929ff7f6 100644
--- a/extensions/microsoft-authentication/yarn.lock
+++ b/extensions/microsoft-authentication/yarn.lock
@@ -198,11 +198,6 @@ uuid@^8.2.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
-
webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
diff --git a/extensions/notebook-renderers/src/color.ts b/extensions/notebook-renderers/src/color.ts
index 2c01cae1071..9ad281d35c4 100644
--- a/extensions/notebook-renderers/src/color.ts
+++ b/extensions/notebook-renderers/src/color.ts
@@ -866,9 +866,7 @@ export class Color {
private _toString?: string;
toString(): string {
- if (!this._toString) {
- this._toString = Color.Format.CSS.format(this);
- }
+ this._toString ??= Color.Format.CSS.format(this);
return this._toString;
}
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 9cc9ac5dedb..cae1fd7eab1 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -22,7 +22,7 @@
"jsonc-parser": "^2.2.1",
"minimatch": "^3.0.4",
"request-light": "^0.5.7",
- "vscode-nls": "^5.1.0",
+ "vscode-nls": "^5.2.0",
"which": "^2.0.2",
"which-pm": "^2.0.0"
},
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
index 3479f1c58b6..bfd3b4b3de1 100644
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@@ -192,10 +192,10 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
which-pm@^2.0.0:
version "2.0.0"
diff --git a/extensions/package.json b/extensions/package.json
index 8f1df05f4e5..e12225cc76f 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -4,7 +4,7 @@
"license": "MIT",
"description": "Dependencies shared by all extensions",
"dependencies": {
- "typescript": "4.8.3"
+ "typescript": "4.8.4"
},
"scripts": {
"postinstall": "node ./postinstall.mjs"
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index 8782b3d83b4..dd7f6445d1a 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -74,7 +74,7 @@
"watch": "npx gulp watch-extension:php-language-features"
},
"dependencies": {
- "vscode-nls": "^5.1.0",
+ "vscode-nls": "^5.2.0",
"which": "^2.0.2"
},
"devDependencies": {
diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock
index 62c8b33e55d..baafbeb7ca3 100644
--- a/extensions/php-language-features/yarn.lock
+++ b/extensions/php-language-features/yarn.lock
@@ -17,10 +17,10 @@ isexe@^2.0.0:
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
which@^2.0.2:
version "2.0.2"
diff --git a/extensions/php/snippets/php.code-snippets b/extensions/php/snippets/php.code-snippets
index 9c061291647..3c213765b4b 100644
--- a/extensions/php/snippets/php.code-snippets
+++ b/extensions/php/snippets/php.code-snippets
@@ -12,6 +12,7 @@
},
"PHPDoc class …": {
"prefix": "doc_class",
+ "isFileTemplate": true,
"body": [
"/**",
" * ${6:undocumented class}",
@@ -42,6 +43,7 @@
},
"PHPDoc function …": {
"prefix": "doc_f",
+ "isFileTemplate": true,
"body": [
"/**",
" * ${1:undocumented function summary}",
diff --git a/extensions/python/package.json b/extensions/python/package.json
index 6134d05a215..17cbe7787e1 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -28,7 +28,6 @@
"py"
],
"filenames": [
- "Snakefile",
"SConstruct",
"SConscript"
],
diff --git a/extensions/python/test/colorize-fixtures/test.py b/extensions/python/test/colorize-fixtures/test.py
index c92f2c70a8b..c32f12e4f8b 100644
--- a/extensions/python/test/colorize-fixtures/test.py
+++ b/extensions/python/test/colorize-fixtures/test.py
@@ -19,13 +19,10 @@ class Monkey:
}=42):
pass
-if 1900 < year < 2100 and 1 <= month <= 12 \
- and 1 <= day <= 31 and 0 <= hour < 24 \
- and 0 <= minute < 60 and 0 <= second < 60: # Looks like a valid date
- return 1
+pass
def firstn(g, n):
- for i in range(n):
+ for _ in range(n):
yield g.next()
reduce(lambda x,y: x+y, [47,11,42,13])
@@ -37,15 +34,14 @@ mydictionary = {
}
def steuern(einkommen):
- """Berechnung der zu zahlenden Steuern fuer ein zu versteuerndes Einkommen von x"""
- if einkommen <= 8004:
- steuer = 0
- elif einkommen <= 13469:
- y = (einkommen -8004.0)/10000.0
- steuer = (912.17 * y + 1400)*y
- else:
- steuer = einkommen * 0.44 - 15694
- return steuer
+ """Berechnung der zu zahlenden Steuern fuer ein zu versteuerndes Einkommen von x"""
+ if einkommen <= 8004:
+ return 0
+ elif einkommen <= 13469:
+ y = (einkommen -8004.0)/10000.0
+ return (912.17 * y + 1400)*y
+ else:
+ return einkommen * 0.44 - 15694
def beliebig(x, y, *mehr):
print "x=", x, ", x=", y
diff --git a/extensions/razor/build/update-grammar.mjs b/extensions/razor/build/update-grammar.mjs
new file mode 100644
index 00000000000..259f4278466
--- /dev/null
+++ b/extensions/razor/build/update-grammar.mjs
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// @ts-check
+
+import * as vscodeGrammarUpdater from 'vscode-grammar-updater';
+
+function patchGrammar(grammar) {
+ grammar.scopeName = 'text.html.cshtml';
+ return grammar;
+}
+
+const razorGrammarRepo = 'OmniSharp/omnisharp-vscode';
+const grammarPath = 'src/razor/syntaxes/aspnetcorerazor.tmLanguage.json';
+vscodeGrammarUpdater.update(razorGrammarRepo, grammarPath, './syntaxes/cshtml.tmLanguage.json', grammar => patchGrammar(grammar));
+
+
diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json
index 2ad1d82c1ea..22f3f066f95 100644
--- a/extensions/razor/cgmanifest.json
+++ b/extensions/razor/cgmanifest.json
@@ -4,13 +4,37 @@
"component": {
"type": "git",
"git": {
- "name": "demyte/language-cshtml",
- "repositoryUrl": "https://github.com/demyte/language-cshtml",
- "commitHash": "e6e54d5a86a28cc1e44609a32aaa10a244cd3f81"
+ "name": "OmniSharp/omnisharp-vscode",
+ "repositoryUrl": "https://github.com/OmniSharp/omnisharp-vscode",
+ "commitHash": "85d6eeea14e9aef51934697de78c77fbddbf1aa8"
}
},
"license": "MIT",
- "version": "0.3.0"
+ "version": "1.24.0",
+ "licenseDetail": [
+ "MIT License",
+ "",
+ "Copyright (c) .NET Foundation and Contributors",
+ "All Rights Reserved",
+ "",
+ "Permission is hereby granted, free of charge, to any person obtaining a copy",
+ "of this software and associated documentation files (the \"Software\"), to deal",
+ "in the Software without restriction, including without limitation the rights",
+ "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+ "copies of the Software, and to permit persons to whom the Software is",
+ "furnished to do so, subject to the following conditions:",
+ "",
+ "The above copyright notice and this permission notice shall be included in all",
+ "copies or substantial portions of the Software.",
+ "",
+ "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+ "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+ "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+ "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+ "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+ "SOFTWARE."
+ ]
}
],
"version": 1
diff --git a/extensions/razor/package.json b/extensions/razor/package.json
index ace1ed7f959..2312ce86c48 100644
--- a/extensions/razor/package.json
+++ b/extensions/razor/package.json
@@ -8,6 +8,9 @@
"engines": {
"vscode": "0.10.x"
},
+ "scripts": {
+ "update-grammar": "node ./build/update-grammar.mjs"
+ },
"contributes": {
"languages": [
{
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index c662cee2fa3..0f48c15e575 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.tmLanguage.json
@@ -1,57 +1,480 @@
{
"information_for_contributors": [
- "This file has been converted from https://github.com/demyte/language-cshtml/blob/master/grammars/cshtml.json",
+ "This file has been converted from https://github.com/OmniSharp/omnisharp-vscode/blob/master/src/razor/syntaxes/aspnetcorerazor.tmLanguage.json",
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
- "version": "https://github.com/demyte/language-cshtml/commit/e6e54d5a86a28cc1e44609a32aaa10a244cd3f81",
+ "version": "https://github.com/OmniSharp/omnisharp-vscode/commit/85d6eeea14e9aef51934697de78c77fbddbf1aa8",
"name": "ASP.NET Razor",
"scopeName": "text.html.cshtml",
"patterns": [
{
- "include": "#razor-directives"
- },
- {
- "include": "#razor-code-block"
- },
- {
- "include": "#razor-else-if"
- },
- {
- "include": "#razor-if"
- },
- {
- "include": "#razor-else"
- },
- {
- "include": "#razor-foreach"
- },
- {
- "include": "#explicit-razor-expression"
- },
- {
- "include": "#implicit-razor-expression"
+ "include": "#razor-control-structures"
},
{
"include": "text.html.basic"
}
],
"repository": {
- "comments": {
- "begin": "@\\*",
- "captures": {
- "0": {
- "name": "punctuation.definition.comment.source.cshtml"
- }
- },
- "end": "\\*@",
- "name": "comment.block.cshtml"
- },
- "razor-directives": {
- "name": "meta.directive.cshtml",
+ "razor-control-structures": {
"patterns": [
{
- "include": "#using-directive"
+ "include": "#razor-comment"
+ },
+ {
+ "include": "#razor-codeblock"
+ },
+ {
+ "include": "#explicit-razor-expression"
+ },
+ {
+ "include": "#escaped-transition"
+ },
+ {
+ "include": "#directives"
+ },
+ {
+ "include": "#transitioned-csharp-control-structures"
+ },
+ {
+ "include": "#implicit-expression"
+ }
+ ]
+ },
+ "escaped-transition": {
+ "name": "constant.character.escape.razor.transition",
+ "match": "@@"
+ },
+ "transition": {
+ "match": "@",
+ "name": "keyword.control.cshtml.transition"
+ },
+ "razor-codeblock": {
+ "name": "meta.structure.razor.codeblock",
+ "begin": "(@)(\\{)",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.codeblock.open"
+ }
+ },
+ "contentName": "source.cs",
+ "patterns": [
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(\\})",
+ "endCaptures": {
+ "1": {
+ "name": "keyword.control.razor.directive.codeblock.close"
+ }
+ }
+ },
+ "razor-codeblock-body": {
+ "patterns": [
+ {
+ "include": "#text-tag"
+ },
+ {
+ "include": "#wellformed-html"
+ },
+ {
+ "include": "#razor-single-line-markup"
+ },
+ {
+ "include": "#razor-control-structures"
+ },
+ {
+ "include": "source.cs"
+ }
+ ]
+ },
+ "razor-single-line-markup": {
+ "match": "(\\@\\:)([^$]*)$",
+ "captures": {
+ "1": {
+ "name": "keyword.control.razor.singleLineMarkup"
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "#razor-control-structures"
+ },
+ {
+ "include": "text.html.basic"
+ }
+ ]
+ }
+ }
+ },
+ "text-tag": {
+ "begin": "()",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.cshtml.transition.textTag.open"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#wellformed-html"
+ },
+ {
+ "include": "$self"
+ }
+ ],
+ "end": "()",
+ "endCaptures": {
+ "1": {
+ "name": "keyword.control.cshtml.transition.textTag.close"
+ }
+ }
+ },
+ "razor-comment": {
+ "name": "meta.comment.razor",
+ "begin": "(@)(\\*)",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.comment.star"
+ }
+ },
+ "contentName": "comment.block.razor",
+ "end": "(\\*)(@)",
+ "endCaptures": {
+ "1": {
+ "name": "keyword.control.razor.comment.star"
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ }
+ }
+ },
+ "wellformed-html": {
+ "patterns": [
+ {
+ "include": "#void-tag"
+ },
+ {
+ "include": "#non-void-tag"
+ }
+ ]
+ },
+ "void-tag": {
+ "name": "meta.tag.structure.$3.void.html",
+ "begin": "(?i)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.definition.tag.begin.html"
+ },
+ "2": {
+ "name": "constant.character.escape.razor.tagHelperOptOut"
+ },
+ "3": {
+ "name": "entity.name.tag.html"
+ }
+ },
+ "patterns": [
+ {
+ "include": "text.html.basic#attribute"
+ }
+ ],
+ "end": "/?>",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.tag.end.html"
+ }
+ }
+ },
+ "non-void-tag": {
+ "begin": "(?=<(!)?([^/\\s>]+)(\\s|/?>))",
+ "end": "()|(/>)",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.definition.tag.begin.html"
+ },
+ "2": {
+ "name": "entity.name.tag.html"
+ },
+ "3": {
+ "name": "punctuation.definition.tag.end.html"
+ },
+ "4": {
+ "name": "punctuation.definition.tag.end.html"
+ }
+ },
+ "patterns": [
+ {
+ "begin": "(<)(!)?([^/\\s>]+)(?=\\s|/?>)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.definition.tag.begin.html"
+ },
+ "2": {
+ "name": "constant.character.escape.razor.tagHelperOptOut"
+ },
+ "3": {
+ "name": "entity.name.tag.html"
+ }
+ },
+ "end": "(?=/?>)",
+ "patterns": [
+ {
+ "include": "#razor-control-structures"
+ },
+ {
+ "include": "text.html.basic#attribute"
+ }
+ ]
+ },
+ {
+ "begin": ">",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.tag.end.html"
+ }
+ },
+ "end": "(?=\\{\\}\\)\\]'\"])"
+ },
+ "implicit-expression-body": {
+ "patterns": [
+ {
+ "include": "#implicit-expression-invocation-start"
+ },
+ {
+ "include": "#implicit-expression-accessor-start"
+ }
+ ],
+ "end": "(?=[\\s<>\\{\\}\\)\\]'\"])"
+ },
+ "implicit-expression-invocation-start": {
+ "begin": "([_[:alpha:]][_[:alnum:]]*)(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "entity.name.function.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#implicit-expression-continuation"
+ }
+ ],
+ "end": "(?=[\\s<>\\{\\}\\)\\]'\"])"
+ },
+ "implicit-expression-accessor-start": {
+ "begin": "([_[:alpha:]][_[:alnum:]]*)",
+ "beginCaptures": {
+ "1": {
+ "name": "variable.other.object.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#implicit-expression-continuation"
+ }
+ ],
+ "end": "(?=[\\s<>\\{\\}\\)\\]'\"])"
+ },
+ "implicit-expression-continuation": {
+ "patterns": [
+ {
+ "include": "#balanced-parenthesis-csharp"
+ },
+ {
+ "include": "#balanced-brackets-csharp"
+ },
+ {
+ "include": "#implicit-expression-invocation"
+ },
+ {
+ "include": "#implicit-expression-accessor"
+ },
+ {
+ "include": "#implicit-expression-extension"
+ }
+ ],
+ "end": "(?=[\\s<>\\{\\}\\)\\]'\"])"
+ },
+ "implicit-expression-accessor": {
+ "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*",
+ "name": "variable.other.object.property.cs"
+ },
+ "implicit-expression-invocation": {
+ "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*(?=\\()",
+ "name": "entity.name.function.cs"
+ },
+ "implicit-expression-operator": {
+ "patterns": [
+ {
+ "include": "#implicit-expression-dot-operator"
+ },
+ {
+ "include": "#implicit-expression-null-conditional-operator"
+ },
+ {
+ "include": "#implicit-expression-null-forgiveness-operator"
+ }
+ ]
+ },
+ "implicit-expression-dot-operator": {
+ "match": "(\\.)(?=[_[:alpha:]][_[:alnum:]]*)",
+ "captures": {
+ "1": {
+ "name": "punctuation.accessor.cs"
+ }
+ }
+ },
+ "implicit-expression-null-conditional-operator": {
+ "match": "(\\?)(?=[.\\[])",
+ "captures": {
+ "1": {
+ "name": "keyword.operator.null-conditional.cs"
+ }
+ }
+ },
+ "implicit-expression-null-forgiveness-operator": {
+ "match": "(\\!)(?=(?:\\.[_[:alpha:]][_[:alnum:]]*)|\\?|[\\[\\(])",
+ "captures": {
+ "1": {
+ "name": "keyword.operator.logical.cs"
+ }
+ }
+ },
+ "balanced-parenthesis-csharp": {
+ "begin": "(\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.parenthesis.open.cs"
+ }
+ },
+ "name": "razor.test.balanced.parenthesis",
+ "patterns": [
+ {
+ "include": "source.cs"
+ }
+ ],
+ "end": "(\\))",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.parenthesis.close.cs"
+ }
+ }
+ },
+ "balanced-brackets-csharp": {
+ "begin": "(\\[)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.squarebracket.open.cs"
+ }
+ },
+ "name": "razor.test.balanced.brackets",
+ "patterns": [
+ {
+ "include": "source.cs"
+ }
+ ],
+ "end": "(\\])",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.squarebracket.close.cs"
+ }
+ }
+ },
+ "directives": {
+ "patterns": [
+ {
+ "include": "#code-directive"
+ },
+ {
+ "include": "#functions-directive"
+ },
+ {
+ "include": "#page-directive"
+ },
+ {
+ "include": "#addTagHelper-directive"
+ },
+ {
+ "include": "#removeTagHelper-directive"
+ },
+ {
+ "include": "#tagHelperPrefix-directive"
},
{
"include": "#model-directive"
@@ -59,283 +482,1030 @@
{
"include": "#inherits-directive"
},
+ {
+ "include": "#implements-directive"
+ },
+ {
+ "include": "#namespace-directive"
+ },
{
"include": "#inject-directive"
},
{
- "include": "#implements-directive"
+ "include": "#attribute-directive"
+ },
+ {
+ "include": "#section-directive"
},
{
"include": "#layout-directive"
},
{
- "include": "#page-directive"
- },
- {
- "include": "#functions-directive"
+ "include": "#using-directive"
}
]
},
- "explicit-razor-expression": {
- "name": "meta.expression.explicit.cshtml",
- "begin": "(@)\\(",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "code-directive": {
+ "begin": "(@)(code)\\s*",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.code"
}
},
"patterns": [
{
- "include": "source.cs"
+ "include": "#directive-codeblock"
}
],
- "end": "\\)"
- },
- "implicit-razor-expression": {
- "name": "meta.expression.implicit.cshtml",
- "begin": "(@)([a-zA-Z0-9\\.\\_\\(\\)]+)",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "end": "$"
- },
- "using-directive": {
- "name": "meta.directive.using.cshtml",
- "begin": "(@using)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-namespace-identifier"
- }
- ],
- "end": "$"
- },
- "model-directive": {
- "name": "meta.directive.model.cshtml",
- "begin": "(@model)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-type-name"
- }
- ],
- "end": "$"
- },
- "inherits-directive": {
- "name": "meta.directive.inherits.cshtml",
- "begin": "(@inherits)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-type-name"
- }
- ],
- "end": "$"
- },
- "inject-directive": {
- "name": "meta.directive.inject.cshtml",
- "begin": "(@inject)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-type-name"
- }
- ],
- "end": "$"
- },
- "implements-directive": {
- "name": "meta.directive.implements.cshtml",
- "begin": "(@implements)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-type-name"
- }
- ],
- "end": "$"
- },
- "layout-directive": {
- "name": "meta.directive.layout.cshtml",
- "begin": "(@layout)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "#csharp-type-name"
- }
- ],
- "end": "$"
- },
- "page-directive": {
- "name": "meta.directive.page.cshtml",
- "begin": "(@page)\\s+",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
- "patterns": [
- {
- "include": "source.cs"
- }
- ],
- "end": "$"
+ "end": "(?<=})|\\s"
},
"functions-directive": {
- "name": "meta.directive.functions.cshtml",
- "match": "(@functions)",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "begin": "(@)(functions)\\s*",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.functions"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#directive-codeblock"
+ }
+ ],
+ "end": "(?<=})|\\s"
+ },
+ "directive-codeblock": {
+ "begin": "(\\{)",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.razor.directive.codeblock.open"
+ }
+ },
+ "name": "meta.structure.razor.directive.codeblock",
+ "contentName": "source.cs",
+ "patterns": [
+ {
+ "include": "source.cs"
+ }
+ ],
+ "end": "(\\})",
+ "endCaptures": {
+ "1": {
+ "name": "keyword.control.razor.directive.codeblock.close"
}
}
},
- "razor-if": {
- "begin": "(@if)",
+ "page-directive": {
+ "name": "meta.directive",
+ "match": "(@)(page)\\s+([^$]+)?",
"captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.page"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#string-literal"
+ }
+ ]
}
- },
- "patterns": [
- {
- "include": "source.cs"
- }
- ],
- "end": "$"
+ }
},
- "razor-else": {
- "begin": "(else)",
+ "addTagHelper-directive": {
+ "name": "meta.directive",
+ "match": "(@)(addTagHelper)\\s+([^$]+)?",
"captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.addTagHelper"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#tagHelper-directive-argument"
+ }
+ ]
}
- },
- "patterns": [
- {
- "include": "source.cs"
- }
- ],
- "end": "$"
+ }
},
- "razor-else-if": {
- "begin": "(else\\s+if)",
+ "removeTagHelper-directive": {
+ "name": "meta.directive",
+ "match": "(@)(removeTagHelper)\\s+([^$]+)?",
"captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.removeTagHelper"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#tagHelper-directive-argument"
+ }
+ ]
}
- },
- "patterns": [
- {
- "include": "source.cs"
- }
- ],
- "end": "$"
+ }
},
- "razor-foreach": {
- "begin": "(@foreach)\\s+\\(",
+ "tagHelperPrefix-directive": {
+ "name": "meta.directive",
+ "match": "(@)(tagHelperPrefix)\\s+([^$]+)?",
"captures": {
- "0": {
- "name": "keyword.control.cshtml"
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.tagHelperPrefix"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#tagHelper-directive-argument"
+ }
+ ]
}
- },
- "patterns": [
- {
- "include": "source.cs"
- }
- ],
- "end": "\\)"
+ }
},
- "razor-code-block": {
- "begin": "@?\\{",
- "captures": {
- "0": {
- "name": "keyword.control.cshtml"
- }
- },
+ "tagHelper-directive-argument": {
"patterns": [
{
- "include": "text.html.cshtml"
+ "include": "source.cs#string-literal"
},
{
- "include": "source.cs"
- }
- ],
- "end": "\\}"
- },
- "csharp-namespace-identifier": {
- "patterns": [
- {
- "name": "entity.name.type.namespace.cs",
- "match": "[_[:alpha:]][_[:alnum:]]*"
+ "include": "#unquoted-string-argument"
}
]
},
- "csharp-type-name": {
+ "unquoted-string-argument": {
+ "name": "string.quoted.double.cs",
+ "match": "[^$]+"
+ },
+ "model-directive": {
+ "name": "meta.directive",
+ "match": "(@)(model)\\s+([^$]+)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.model"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "inherits-directive": {
+ "name": "meta.directive",
+ "match": "(@)(inherits)\\s+([^$]+)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.inherits"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "implements-directive": {
+ "name": "meta.directive",
+ "match": "(@)(implements)\\s+([^$]+)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.implements"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "layout-directive": {
+ "name": "meta.directive",
+ "match": "(@)(layout)\\s+([^$]+)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.layout"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "namespace-directive": {
+ "name": "meta.directive",
+ "match": "(@)(namespace)\\s+([^\\s]+)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.namespace"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#namespace-directive-argument"
+ }
+ ]
+ }
+ }
+ },
+ "namespace-directive-argument": {
+ "match": "([_[:alpha:]][_[:alnum:]]*)(\\.)?",
+ "captures": {
+ "1": {
+ "name": "entity.name.type.namespace.cs"
+ },
+ "2": {
+ "name": "punctuation.accessor.cs"
+ }
+ }
+ },
+ "inject-directive": {
+ "name": "meta.directive",
+ "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.inject"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ },
+ "4": {
+ "name": "entity.name.variable.property.cs"
+ }
+ }
+ },
+ "attribute-directive": {
+ "name": "meta.directive",
+ "begin": "(@)(attribute)\\b\\s+",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.attribute"
+ }
+ },
"patterns": [
{
- "match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)",
- "captures": {
- "1": {
- "name": "entity.name.type.alias.cs"
- },
- "2": {
- "name": "punctuation.separator.coloncolon.cs"
+ "include": "source.cs#attribute-section"
+ }
+ ],
+ "end": "(?<=\\])|$"
+ },
+ "section-directive": {
+ "name": "meta.directive.block",
+ "begin": "(@)(section)\\b\\s+([_[:alpha:]][_[:alnum:]]*)?",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
}
- }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.razor.directive.section"
+ },
+ "3": {
+ "name": "variable.other.razor.directive.sectionName"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#directive-markupblock"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "directive-markupblock": {
+ "name": "meta.structure.razor.directive.markblock",
+ "begin": "(\\{)",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.razor.directive.codeblock.open"
+ }
+ },
+ "patterns": [
+ {
+ "include": "$self"
+ }
+ ],
+ "end": "(\\})",
+ "endCaptures": {
+ "1": {
+ "name": "keyword.control.razor.directive.codeblock.close"
+ }
+ }
+ },
+ "using-directive": {
+ "name": "meta.directive",
+ "match": "(@)(using)\\b\\s+(?!\\(|\\s)(.+?)?(;)?$",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.other.using.cs"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#using-static-directive"
+ },
+ {
+ "include": "#using-alias-directive"
+ },
+ {
+ "include": "#using-standard-directive"
+ }
+ ]
+ },
+ "4": {
+ "name": "keyword.control.razor.optionalSemicolon"
+ }
+ }
+ },
+ "using-static-directive": {
+ "match": "(static)\\b\\s+(.+)",
+ "captures": {
+ "1": {
+ "name": "keyword.other.static.cs"
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "using-alias-directive": {
+ "match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(=)\\s*(.+)\\s*",
+ "captures": {
+ "1": {
+ "name": "entity.name.type.alias.cs"
+ },
+ "2": {
+ "name": "keyword.operator.assignment.cs"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ }
+ }
+ },
+ "using-standard-directive": {
+ "match": "([_[:alpha:]][_[:alnum:]]*)\\s*",
+ "captures": {
+ "1": {
+ "name": "entity.name.type.namespace.cs"
+ }
+ }
+ },
+ "transitioned-csharp-control-structures": {
+ "patterns": [
+ {
+ "include": "#using-statement"
},
{
- "match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\.)",
- "captures": {
- "1": {
- "name": "storage.type.cs"
- },
- "2": {
- "name": "punctuation.accessor.cs"
- }
- }
+ "include": "#if-statement"
},
{
- "match": "(\\.)\\s*([_[:alpha:]][_[:alnum:]]*)",
- "captures": {
- "1": {
- "name": "punctuation.accessor.cs"
- },
- "2": {
- "name": "storage.type.cs"
- }
- }
+ "include": "#else-part"
},
{
- "name": "storage.type.cs",
- "match": "[_[:alpha:]][_[:alnum:]]*"
+ "include": "#foreach-statement"
+ },
+ {
+ "include": "#for-statement"
+ },
+ {
+ "include": "#while-statement"
+ },
+ {
+ "include": "#switch-statement"
+ },
+ {
+ "include": "#lock-statement"
+ },
+ {
+ "include": "#do-statement"
+ },
+ {
+ "include": "#try-statement"
}
]
+ },
+ "using-statement": {
+ "name": "meta.statement.using.razor",
+ "begin": "(?:^\\s*|(@))(using)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.other.using.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "if-statement": {
+ "name": "meta.statement.if.razor",
+ "begin": "(?:^\\s*|(@))(if)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.conditional.if.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "else-part": {
+ "name": "meta.statement.else.razor",
+ "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n\\(\\{])",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.conditional.else.cs"
+ },
+ "2": {
+ "name": "keyword.control.conditional.if.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "for-statement": {
+ "name": "meta.statement.for.razor",
+ "begin": "(?:^\\s*|(@))(for)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.loop.for.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "foreach-statement": {
+ "name": "meta.statement.foreach.razor",
+ "begin": "(?:^\\s*|(@)(await\\s+)?)(foreach)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "#await-prefix"
+ }
+ ]
+ },
+ "3": {
+ "name": "keyword.control.loop.foreach.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#foreach-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "foreach-condition": {
+ "begin": "\\(",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.parenthesis.open.cs"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.parenthesis.close.cs"
+ }
+ },
+ "patterns": [
+ {
+ "match": "(?x)\n(?:\n (\\bvar\\b)|\n (?\n (?:\n (?:\n (?:(?@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (? # identifier + type arguments (if any)\n \\g\\s*\n (?\\s*<(?:[^<>]|\\g)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g)* | # Are there any more names being dotted into?\n (?\\s*\\((?:[^\\(\\)]|\\g)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?\n )\n )\n)\\s+\n(\\g)\\s+\n\\b(in)\\b",
+ "captures": {
+ "1": {
+ "name": "keyword.other.var.cs"
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ },
+ "7": {
+ "name": "entity.name.variable.local.cs"
+ },
+ "8": {
+ "name": "keyword.control.loop.in.cs"
+ }
+ }
+ },
+ {
+ "match": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)?\n(?\\((?:[^\\(\\)]|\\g)+\\))\\s+\n\\b(in)\\b",
+ "captures": {
+ "1": {
+ "name": "keyword.other.var.cs"
+ },
+ "2": {
+ "patterns": [
+ {
+ "include": "source.cs#tuple-declaration-deconstruction-element-list"
+ }
+ ]
+ },
+ "3": {
+ "name": "keyword.control.loop.in.cs"
+ }
+ }
+ },
+ {
+ "include": "source.cs#expression"
+ }
+ ]
+ },
+ "do-statement": {
+ "name": "meta.statement.do.razor",
+ "begin": "(?:^\\s*|(@))(do)\\b\\s*",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.loop.do.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "while-statement": {
+ "name": "meta.statement.while.razor",
+ "begin": "(?:(@)|^\\s*|(?<=})\\s*)(while)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.loop.while.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})|(;)",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.terminator.statement.cs"
+ }
+ }
+ },
+ "switch-statement": {
+ "name": "meta.statement.switch.razor",
+ "begin": "(?:^\\s*|(@))(switch)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.switch.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#switch-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "switch-code-block": {
+ "name": "meta.structure.razor.csharp.codeblock.switch",
+ "begin": "(\\{)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.curlybrace.open.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "source.cs#switch-label"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(\\})",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.curlybrace.close.cs"
+ }
+ }
+ },
+ "lock-statement": {
+ "name": "meta.statement.lock.razor",
+ "begin": "(?:^\\s*|(@))(lock)\\b\\s*(?=\\()",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.other.lock.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "try-statement": {
+ "patterns": [
+ {
+ "include": "#try-block"
+ },
+ {
+ "include": "#catch-clause"
+ },
+ {
+ "include": "#finally-clause"
+ }
+ ]
+ },
+ "try-block": {
+ "name": "meta.statement.try.razor",
+ "begin": "(?:^\\s*|(@))(try)\\b\\s*",
+ "beginCaptures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "#transition"
+ }
+ ]
+ },
+ "2": {
+ "name": "keyword.control.try.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-condition"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "catch-clause": {
+ "name": "meta.statement.catch.razor",
+ "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n\\(\\{])",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.try.catch.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#catch-condition"
+ },
+ {
+ "include": "source.cs#when-clause"
+ },
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "catch-condition": {
+ "begin": "\\(",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.parenthesis.open.cs"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.parenthesis.close.cs"
+ }
+ },
+ "patterns": [
+ {
+ "match": "(?x)\n(?\n (?:\n (?:\n (?:(?@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (? # identifier + type arguments (if any)\n \\g\\s*\n (?\\s*<(?:[^<>]|\\g)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g)* | # Are there any more names being dotted into?\n (?\\s*\\((?:[^\\(\\)]|\\g)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?\n )\n)\\s*\n(?:(\\g)\\b)?",
+ "captures": {
+ "1": {
+ "patterns": [
+ {
+ "include": "source.cs#type"
+ }
+ ]
+ },
+ "6": {
+ "name": "entity.name.variable.local.cs"
+ }
+ }
+ }
+ ]
+ },
+ "finally-clause": {
+ "name": "meta.statement.finally.razor",
+ "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n\\{])",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.try.finally.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#csharp-code-block"
+ },
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(?<=})"
+ },
+ "await-prefix": {
+ "name": "keyword.other.await.cs",
+ "match": "(await)\\s+"
+ },
+ "csharp-code-block": {
+ "name": "meta.structure.razor.csharp.codeblock",
+ "begin": "(\\{)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.curlybrace.open.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#razor-codeblock-body"
+ }
+ ],
+ "end": "(\\})",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.curlybrace.close.cs"
+ }
+ }
+ },
+ "csharp-condition": {
+ "begin": "(\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.parenthesis.open.cs"
+ }
+ },
+ "patterns": [
+ {
+ "include": "source.cs#local-variable-declaration"
+ },
+ {
+ "include": "source.cs#expression"
+ },
+ {
+ "include": "source.cs#punctuation-comma"
+ },
+ {
+ "include": "source.cs#punctuation-semicolon"
+ }
+ ],
+ "end": "(\\))",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.parenthesis.close.cs"
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json
index 4176cda3d1a..d3fcadcbffd 100644
--- a/extensions/references-view/package.json
+++ b/extensions/references-view/package.json
@@ -407,7 +407,7 @@
"watch": "npx gulp watch-extension:references-view"
},
"dependencies": {
- "vscode-nls": "^5.1.0"
+ "vscode-nls": "^5.2.0"
},
"devDependencies": {
"@types/node": "16.x"
diff --git a/extensions/references-view/yarn.lock b/extensions/references-view/yarn.lock
index 76eaba8dd6f..1661be7c5d2 100644
--- a/extensions/references-view/yarn.lock
+++ b/extensions/references-view/yarn.lock
@@ -7,7 +7,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.33.tgz#566713b1b626f781c5c58fe3531307283e00720c"
integrity sha512-0PJ0vg+JyU0MIan58IOIFRtSvsb7Ri+7Wltx2qAg94eMOrpg4+uuP3aUHCpxXc1i0jCXiC+zIamSZh3l9AbcQA==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/scss/cgmanifest.json b/extensions/scss/cgmanifest.json
index a67a4f54609..12247769ce2 100644
--- a/extensions/scss/cgmanifest.json
+++ b/extensions/scss/cgmanifest.json
@@ -6,12 +6,12 @@
"git": {
"name": "atom/language-sass",
"repositoryUrl": "https://github.com/atom/language-sass",
- "commitHash": "303bbf0c250fe380b9e57375598cfd916110758b"
+ "commitHash": "f52ab12f7f9346cc2568129d8c4419bd3d506b47"
}
},
"license": "MIT",
"description": "The file syntaxes/scss.json was derived from the Atom package https://github.com/atom/language-sass which was originally converted from the TextMate bundle https://github.com/alexsancho/SASS.tmbundle.",
- "version": "0.61.4"
+ "version": "0.62.1"
}
],
"version": 1
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
index a8f24c1a572..8be35296ddf 100644
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -113,15 +113,6 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi
test: /\.ts$/,
exclude: /node_modules/,
use: [
- // TODO: bring this back once vscode-nls-dev supports browser
- // {
- // // vscode-nls-dev loader:
- // // * rewrite nls-calls
- // loader: 'vscode-nls-dev/lib/webpack-loader',
- // options: {
- // base: path.join(extConfig.context, 'src')
- // }
- // },
{
// configure TypeScript loader:
// * enable sources maps for end-to-end source maps
@@ -137,7 +128,6 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi
},
externals: {
'vscode': 'commonjs vscode', // ignored because it doesn't exist,
- 'vscode-nls-web-data': 'commonjs vscode-nls-web-data', // ignored because this is injected by the webworker extension host
'applicationinsights-native-metrics': 'commonjs applicationinsights-native-metrics', // ignored because we don't ship native module
'@opentelemetry/tracing': 'commonjs @opentelemetry/tracing' // ignored because we don't ship this module
},
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index fe3f4de2a5f..bcd83d483d3 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -11,7 +11,7 @@
"license": "MIT",
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"engines": {
- "vscode": "^1.53.0"
+ "vscode": "^1.70.0"
},
"main": "./out/extension",
"browser": "./dist/browser/extension",
@@ -68,7 +68,7 @@
},
"dependencies": {
"@vscode/extension-telemetry": "0.6.2",
- "vscode-nls": "^5.1.0"
+ "vscode-nls": "^5.2.0"
},
"devDependencies": {
"@types/vscode-webview": "^1.57.0",
diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts
index 63131a43bcf..6d3ded5131b 100644
--- a/extensions/simple-browser/src/extension.ts
+++ b/extensions/simple-browser/src/extension.ts
@@ -23,18 +23,15 @@ const enabledHosts = new Set([
// localhost IPv4
'127.0.0.1',
// localhost IPv6
- '0:0:0:0:0:0:0:1',
- '::1',
+ '[0:0:0:0:0:0:0:1]',
+ '[::1]',
// all interfaces IPv4
'0.0.0.0',
// all interfaces IPv6
- '0:0:0:0:0:0:0:0',
- '::'
+ '[0:0:0:0:0:0:0:0]',
+ '[::]'
]);
-const IPv6Localhost = /0\:0\:0\:0\:0\:0\:0\:1|\:\:1/;
-const IPv6AllInterfaces = /0\:0\:0\:0\:0\:0\:0\:0|\:\:/;
-
const openerId = 'simpleBrowser.open';
export function activate(context: vscode.ExtensionContext) {
@@ -65,13 +62,13 @@ export function activate(context: vscode.ExtensionContext) {
preserveFocus?: boolean;
viewColumn: vscode.ViewColumn;
}) => {
- manager.show(url.toString(), showOptions);
+ manager.show(url, showOptions);
}));
context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, {
canOpenExternalUri(uri: vscode.Uri) {
// We have to replace the IPv6 hosts with IPv4 because URL can't handle IPv6.
- const originalUri = new URL(uri.toString().replace(IPv6Localhost, '127.0.0.1').replace(IPv6AllInterfaces, '0.0.0.0'));
+ const originalUri = new URL(uri.toString(true));
if (enabledHosts.has(originalUri.hostname)) {
return isWeb()
? vscode.ExternalUriOpenerPriority.Default
@@ -81,7 +78,7 @@ export function activate(context: vscode.ExtensionContext) {
return vscode.ExternalUriOpenerPriority.None;
},
openExternalUri(resolveUri: vscode.Uri) {
- return manager.show(resolveUri.toString(), {
+ return manager.show(resolveUri, {
viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
});
}
diff --git a/extensions/simple-browser/src/simpleBrowserManager.ts b/extensions/simple-browser/src/simpleBrowserManager.ts
index 9d59c1816ab..ef485916411 100644
--- a/extensions/simple-browser/src/simpleBrowserManager.ts
+++ b/extensions/simple-browser/src/simpleBrowserManager.ts
@@ -19,7 +19,8 @@ export class SimpleBrowserManager {
this._activeView = undefined;
}
- public show(url: string, options?: ShowOptions): void {
+ public show(inputUri: string | vscode.Uri, options?: ShowOptions): void {
+ const url = typeof inputUri === 'string' ? inputUri : inputUri.toString(true);
if (this._activeView) {
this._activeView.show(url, options);
} else {
@@ -34,7 +35,7 @@ export class SimpleBrowserManager {
const url = state?.url ?? '';
const view = SimpleBrowserView.restore(this.extensionUri, url, panel);
this.registerWebviewListeners(view);
- return;
+ this._activeView ??= view;
}
private registerWebviewListeners(view: SimpleBrowserView) {
@@ -46,4 +47,3 @@ export class SimpleBrowserManager {
}
}
-
diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock
index 32215e9059b..97902582dea 100644
--- a/extensions/simple-browser/yarn.lock
+++ b/extensions/simple-browser/yarn.lock
@@ -56,7 +56,7 @@ vscode-codicons@^0.0.14:
resolved "https://registry.yarnpkg.com/vscode-codicons/-/vscode-codicons-0.0.14.tgz#e0d05418e2e195564ff6f6a2199d70415911c18f"
integrity sha512-6CEH5KT9ct5WMw7n5dlX7rB8ya4CUI2FSq1Wk36XaW+c5RglFtAanUV0T+gvZVVFhl/WxfjTvFHq06Hz9c1SLA==
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json
index 3157d39b234..7ce14d2de22 100644
--- a/extensions/theme-abyss/themes/abyss-color-theme.json
+++ b/extensions/theme-abyss/themes/abyss-color-theme.json
@@ -409,6 +409,7 @@
// "activityBar.foreground": "",
// "activityBarBadge.background": "",
// "activityBarBadge.foreground": "",
+ "activityBarItem.settingsProfilesBackground": "#082877",
// Workbench: Panel
// "panel.background": "",
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 7a80ebf00e0..9a5092043d9 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -2,6 +2,7 @@
"$schema": "vscode://schemas/color-theme",
"name": "Light (Visual Studio)",
"colors": {
+ "activityBarItem.settingsProfilesBackground": "#4d4d4d",
"editor.background": "#FFFFFF",
"editor.foreground": "#000000",
"editor.inactiveSelectionBackground": "#E5EBF1",
@@ -103,7 +104,7 @@
{
"scope": "entity.other.attribute-name",
"settings": {
- "foreground": "#ff0000"
+ "foreground": "#e50000"
}
},
{
@@ -328,7 +329,7 @@
"source.coffee.embedded"
],
"settings": {
- "foreground": "#ff0000"
+ "foreground": "#e50000"
}
},
{
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index 76cdb8a9753..8208d90f102 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -32,6 +32,7 @@
"ports.iconRunningProcessForeground": "#369432",
"activityBar.background": "#221a0f",
"activityBar.foreground": "#d3af86",
+ "activityBarItem.settingsProfilesBackground": "#47351d",
"sideBar.background": "#362712",
"menu.background": "#362712",
"menu.foreground": "#CCCCCC",
diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js
index c55af7ab7fe..ab2a1c81e81 100644
--- a/extensions/theme-seti/build/update-icon-theme.js
+++ b/extensions/theme-seti/build/update-icon-theme.js
@@ -47,7 +47,11 @@ const inheritIconFromLanguage = {
"postcss": 'css',
"django-html": 'html',
"blade": 'php'
-}
+};
+
+const ignoreExtAssociation = {
+ "properties": true
+};
const FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
@@ -399,7 +403,7 @@ exports.update = function () {
if (!nonBuiltInLanguages[lang] && !inheritIconFromLanguage[lang]) {
for (let i2 = 0; i2 < exts.length; i2++) {
// remove the extension association, unless it is different from the preferred
- if (ext2Def[exts[i2]] === preferredDef) {
+ if (ext2Def[exts[i2]] === preferredDef || ignoreExtAssociation[exts[i2]]) {
delete ext2Def[exts[i2]];
}
}
diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json
index 919b27b7c91..b2b36944416 100644
--- a/extensions/theme-seti/cgmanifest.json
+++ b/extensions/theme-seti/cgmanifest.json
@@ -6,7 +6,7 @@
"git": {
"name": "seti-ui",
"repositoryUrl": "https://github.com/jesseweed/seti-ui",
- "commitHash": "2d10473b7575ec00c47eda751ea9caeec6b0b606"
+ "commitHash": "fd20793e5a75b350eab8d489165fb9b420df3f62"
}
},
"version": "0.1.0"
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index f0e47486995..88cb75699ed 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index abf5c8a0a7e..f5b78299680 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -1575,8 +1575,6 @@
"cfm": "_coldfusion",
"litcoffee": "_coffee",
"config": "_config",
- "cfg": "_config",
- "conf": "_config",
"cr": "_crystal",
"ecr": "_crystal_embedded",
"slang": "_crystal_embedded",
@@ -1731,7 +1729,6 @@
"webp": "_image",
"sublime-project": "_sublime",
"sublime-workspace": "_sublime",
- "fish": "_shell",
"mov": "_video",
"ogv": "_video",
"webm": "_video",
@@ -1774,7 +1771,6 @@
"direnv": "_config",
"env": "_config",
"static": "_config",
- "editorconfig": "_config",
"slugignore": "_config",
"tmp": "_clock_1",
"htaccess": "_config",
@@ -1835,14 +1831,19 @@
"yarn.lock": "_yarn",
"webpack.config.js": "_webpack",
"webpack.config.cjs": "_webpack",
+ "webpack.config.ts": "_webpack",
"webpack.config.build.js": "_webpack",
"webpack.config.build.cjs": "_webpack",
+ "webpack.config.build.ts": "_webpack",
"webpack.common.js": "_webpack",
"webpack.common.cjs": "_webpack",
+ "webpack.common.ts": "_webpack",
"webpack.dev.js": "_webpack",
"webpack.dev.cjs": "_webpack",
+ "webpack.dev.ts": "_webpack",
"webpack.prod.js": "_webpack",
"webpack.prod.cjs": "_webpack",
+ "webpack.prod.ts": "_webpack",
"license": "_license",
"licence": "_license",
"license.txt": "_license",
@@ -1887,7 +1888,7 @@
"groovy": "_grails",
"handlebars": "_mustache",
"html": "_html_3",
- "properties": "_java",
+ "properties": "_config",
"java": "_java",
"javascriptreact": "_react",
"javascript": "_javascript",
@@ -1976,8 +1977,6 @@
"cfm": "_coldfusion_light",
"litcoffee": "_coffee_light",
"config": "_config_light",
- "cfg": "_config_light",
- "conf": "_config_light",
"cr": "_crystal_light",
"ecr": "_crystal_embedded_light",
"slang": "_crystal_embedded_light",
@@ -2132,7 +2131,6 @@
"webp": "_image_light",
"sublime-project": "_sublime_light",
"sublime-workspace": "_sublime_light",
- "fish": "_shell_light",
"mov": "_video_light",
"ogv": "_video_light",
"webm": "_video_light",
@@ -2175,7 +2173,6 @@
"direnv": "_config_light",
"env": "_config_light",
"static": "_config_light",
- "editorconfig": "_config_light",
"slugignore": "_config_light",
"tmp": "_clock_1_light",
"htaccess": "_config_light",
@@ -2206,7 +2203,7 @@
"groovy": "_grails_light",
"handlebars": "_mustache_light",
"html": "_html_3_light",
- "properties": "_java_light",
+ "properties": "_config_light",
"java": "_java_light",
"javascriptreact": "_react_light",
"javascript": "_javascript_light",
@@ -2314,14 +2311,19 @@
"yarn.lock": "_yarn_light",
"webpack.config.js": "_webpack_light",
"webpack.config.cjs": "_webpack_light",
+ "webpack.config.ts": "_webpack_light",
"webpack.config.build.js": "_webpack_light",
"webpack.config.build.cjs": "_webpack_light",
+ "webpack.config.build.ts": "_webpack_light",
"webpack.common.js": "_webpack_light",
"webpack.common.cjs": "_webpack_light",
+ "webpack.common.ts": "_webpack_light",
"webpack.dev.js": "_webpack_light",
"webpack.dev.cjs": "_webpack_light",
+ "webpack.dev.ts": "_webpack_light",
"webpack.prod.js": "_webpack_light",
"webpack.prod.cjs": "_webpack_light",
+ "webpack.prod.ts": "_webpack_light",
"license": "_license_light",
"licence": "_license_light",
"license.txt": "_license_light",
@@ -2344,5 +2346,5 @@
"npm-debug.log": "_npm_ignored_light"
}
},
- "version": "https://github.com/jesseweed/seti-ui/commit/2d10473b7575ec00c47eda751ea9caeec6b0b606"
+ "version": "https://github.com/jesseweed/seti-ui/commit/fd20793e5a75b350eab8d489165fb9b420df3f62"
}
\ No newline at end of file
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
index eef990db889..45f1a1d55b0 100644
--- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
+++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
@@ -36,6 +36,7 @@
"statusBar.noFolderBackground": "#001126",
"statusBar.debuggingBackground": "#001126",
"activityBar.background": "#001733",
+ "activityBarItem.settingsProfilesBackground": "#003271",
"progressBar.background": "#bbdaffcc",
"badge.background": "#bbdaffcc",
"badge.foreground": "#001733",
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index cf253fb2b95..7e93b3d9ab0 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -6,7 +6,7 @@
"git": {
"name": "TypeScript-TmLanguage",
"repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage",
- "commitHash": "73af17bf3e45339df06d92751ab366ce96c38516"
+ "commitHash": "c2744520e325330d0608fc1d1993d7fe98e66202"
}
},
"license": "MIT",
diff --git a/extensions/typescript-basics/snippets/typescript.code-snippets b/extensions/typescript-basics/snippets/typescript.code-snippets
index 0162ef50975..35b2aa1711c 100644
--- a/extensions/typescript-basics/snippets/typescript.code-snippets
+++ b/extensions/typescript-basics/snippets/typescript.code-snippets
@@ -14,6 +14,7 @@
},
"Class Definition": {
"prefix": "class",
+ "isFileTemplate": true,
"body": [
"class ${1:name} {",
"\tconstructor(${2:parameters}) {",
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 681581e93d6..636fad5e441 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
- "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
+ "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202",
"name": "TypeScript",
"scopeName": "source.ts",
"patterns": [
@@ -2671,7 +2671,7 @@
{
"name": "meta.object.member.ts meta.object-literal.key.ts",
"begin": "(?=[\\'\\\"\\`])",
- "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as)\\s+))))",
+ "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
"patterns": [
{
"include": "#comment"
@@ -2684,7 +2684,7 @@
{
"name": "meta.object.member.ts meta.object-literal.key.ts",
"begin": "(?x)(?=(\\b(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((? ...)\n \n```\nRequires using TypeScript 4.4+ in the workspace.",
- "comment": "The text inside the ``` block is code and should not be localized."
+ "comment": ["The text inside the ``` block is code and should not be localized."]
},
"configuration.inlayHints.variableTypes.enabled": {
"message": "Enable/disable inlay hints for implicit variable types:\n```typescript\n\nconst foo /* :number */ = Date.now();\n \n```\nRequires using TypeScript 4.4+ in the workspace.",
- "comment": "The text inside the ``` block is code and should not be localized."
+ "comment": ["The text inside the ``` block is code and should not be localized."]
},
"configuration.inlayHints.variableTypes.suppressWhenTypeMatchesName": "Suppress type hints on variables whose name is identical to the type name. Requires using TypeScript 4.8+ in the workspace.",
"configuration.inlayHints.propertyDeclarationTypes.enabled": {
"message": "Enable/disable inlay hints for implicit types on property declarations:\n```typescript\n\nclass Foo {\n\tprop /* :number */ = Date.now();\n}\n \n```\nRequires using TypeScript 4.4+ in the workspace.",
- "comment": "The text inside the ``` block is code and should not be localized."
+ "comment": ["The text inside the ``` block is code and should not be localized."]
},
"configuration.inlayHints.functionLikeReturnTypes.enabled": {
"message": "Enable/disable inlay hints for implicit return types on function signatures:\n```typescript\n\nfunction foo() /* :number */ {\n\treturn Date.now();\n} \n \n```\nRequires using TypeScript 4.4+ in the workspace.",
- "comment": "The text inside the ``` block is code and should not be localized."
+ "comment": ["The text inside the ``` block is code and should not be localized."]
},
"configuration.inlayHints.enumMemberValues.enabled": {
"message": "Enable/disable inlay hints for member values in enum declarations:\n```typescript\n\nenum MyValue {\n\tA /* = 0 */;\n\tB /* = 1 */;\n}\n \n```\nRequires using TypeScript 4.4+ in the workspace.",
- "comment": "The text inside the ``` block is code and should not be localized."
+ "comment": ["The text inside the ``` block is code and should not be localized."]
},
"taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.",
"javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor.",
diff --git a/extensions/typescript-language-features/src/experimentTelemetryReporter.ts b/extensions/typescript-language-features/src/experimentTelemetryReporter.ts
new file mode 100644
index 00000000000..d7561300761
--- /dev/null
+++ b/extensions/typescript-language-features/src/experimentTelemetryReporter.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import VsCodeTelemetryReporter from '@vscode/extension-telemetry';
+import * as tas from 'vscode-tas-client';
+
+export interface IExperimentationTelemetryReporter extends tas.IExperimentationTelemetry, vscode.Disposable {
+ postEventObj(eventName: string, props: { [prop: string]: string }): void;
+}
+
+/**
+ * This reporter *supports* experimentation telemetry,
+ * but will only do so when passed to an {@link ExperimentationService}.
+ */
+
+export class ExperimentationTelemetryReporter
+ implements IExperimentationTelemetryReporter {
+ private _sharedProperties: Record = {};
+ private _reporter: VsCodeTelemetryReporter;
+ constructor(reporter: VsCodeTelemetryReporter) {
+ this._reporter = reporter;
+ }
+
+ setSharedProperty(name: string, value: string): void {
+ this._sharedProperties[name] = value;
+ }
+
+ postEvent(eventName: string, props: Map): void {
+ const propsObject = {
+ ...this._sharedProperties,
+ ...Object.fromEntries(props),
+ };
+ this._reporter.sendTelemetryEvent(eventName, propsObject);
+ }
+
+ postEventObj(eventName: string, props: { [prop: string]: string }) {
+ this._reporter.sendTelemetryEvent(eventName, {
+ ...this._sharedProperties,
+ ...props,
+ });
+ }
+
+ dispose() {
+ this._reporter.dispose();
+ }
+}
+
diff --git a/extensions/typescript-language-features/src/experimentationService.ts b/extensions/typescript-language-features/src/experimentationService.ts
index f739872a824..1f3b1fbd73b 100644
--- a/extensions/typescript-language-features/src/experimentationService.ts
+++ b/extensions/typescript-language-features/src/experimentationService.ts
@@ -4,20 +4,21 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
-import VsCodeTelemetryReporter from '@vscode/extension-telemetry';
import * as tas from 'vscode-tas-client';
+import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
+
interface ExperimentTypes {
// None for now.
}
-export class ExperimentationService implements vscode.Disposable {
+export class ExperimentationService {
private _experimentationServicePromise: Promise;
- private _telemetryReporter: ExperimentTelemetryReporter;
+ private _telemetryReporter: IExperimentationTelemetryReporter;
- constructor(private readonly _extensionContext: vscode.ExtensionContext) {
- this._telemetryReporter = new ExperimentTelemetryReporter(_extensionContext);
- this._experimentationServicePromise = this.createExperimentationService();
+ constructor(telemetryReporter: IExperimentationTelemetryReporter, id: string, version: string, globalState: vscode.Memento) {
+ this._telemetryReporter = telemetryReporter;
+ this._experimentationServicePromise = createExperimentationService(this._telemetryReporter, id, version, globalState);
}
public async getTreatmentVariable(name: K, defaultValue: ExperimentTypes[K]): Promise {
@@ -29,70 +30,33 @@ export class ExperimentationService implements vscode.Disposable {
return defaultValue;
}
}
-
- private async createExperimentationService(): Promise {
- let targetPopulation: tas.TargetPopulation;
- switch (vscode.env.uriScheme) {
- case 'vscode':
- targetPopulation = tas.TargetPopulation.Public;
- break;
- case 'vscode-insiders':
- targetPopulation = tas.TargetPopulation.Insiders;
- break;
- case 'vscode-exploration':
- targetPopulation = tas.TargetPopulation.Internal;
- break;
- case 'code-oss':
- targetPopulation = tas.TargetPopulation.Team;
- break;
- default:
- targetPopulation = tas.TargetPopulation.Public;
- break;
- }
-
- const id = this._extensionContext.extension.id;
- const version = this._extensionContext.extension.packageJSON.version || '';
- const experimentationService = tas.getExperimentationService(id, version, targetPopulation, this._telemetryReporter, this._extensionContext.globalState);
- await experimentationService.initialFetch;
- return experimentationService;
- }
-
-
- /**
- * @inheritdoc
- */
- public dispose() {
- this._telemetryReporter.dispose();
- }
}
-export class ExperimentTelemetryReporter
- implements tas.IExperimentationTelemetry, vscode.Disposable {
- private _sharedProperties: Record = {};
- private _reporter: VsCodeTelemetryReporter;
- constructor(ctxt: vscode.ExtensionContext) {
- const extension = ctxt.extension;
- const packageJSON = extension.packageJSON;
- this._reporter = new VsCodeTelemetryReporter(
- extension.id,
- packageJSON.version || '',
- packageJSON.aiKey || '');
-
+export async function createExperimentationService(
+ reporter: IExperimentationTelemetryReporter,
+ id: string,
+ version: string,
+ globalState: vscode.Memento): Promise {
+ let targetPopulation: tas.TargetPopulation;
+ switch (vscode.env.uriScheme) {
+ case 'vscode':
+ targetPopulation = tas.TargetPopulation.Public;
+ break;
+ case 'vscode-insiders':
+ targetPopulation = tas.TargetPopulation.Insiders;
+ break;
+ case 'vscode-exploration':
+ targetPopulation = tas.TargetPopulation.Internal;
+ break;
+ case 'code-oss':
+ targetPopulation = tas.TargetPopulation.Team;
+ break;
+ default:
+ targetPopulation = tas.TargetPopulation.Public;
+ break;
}
- setSharedProperty(name: string, value: string): void {
- this._sharedProperties[name] = value;
- }
-
- postEvent(eventName: string, props: Map): void {
- const propsObject = {
- ...this._sharedProperties,
- ...Object.fromEntries(props),
- };
- this._reporter.sendTelemetryEvent(eventName, propsObject);
- }
-
- dispose() {
- this._reporter.dispose();
- }
+ const experimentationService = tas.getExperimentationService(id, version, targetPopulation, reporter, globalState);
+ await experimentationService.initialFetch;
+ return experimentationService;
}
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
index 06b650d2375..ad947fc0302 100644
--- a/extensions/typescript-language-features/src/extension.browser.ts
+++ b/extensions/typescript-language-features/src/extension.browser.ts
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
+import VsCodeTelemetryReporter from '@vscode/extension-telemetry';
import { Api, getExtensionApi } from './api';
import { CommandManager } from './commands/commandManager';
import { registerBaseCommands } from './commands/index';
@@ -17,6 +18,8 @@ import API from './utils/api';
import { TypeScriptServiceConfiguration } from './utils/configuration';
import { BrowserServiceConfigurationProvider } from './utils/configuration.browser';
import { PluginManager } from './utils/plugins';
+import { ExperimentationTelemetryReporter, IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
+import { getPackageInfo } from './utils/packageInfo';
class StaticVersionProvider implements ITypeScriptVersionProvider {
@@ -57,6 +60,15 @@ export function activate(
vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(),
API.fromSimpleString('4.8.2')));
+ let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
+ const packageInfo = getPackageInfo(context);
+ if (packageInfo) {
+ const { name: id, version, aiKey } = packageInfo;
+ const vscTelemetryReporter = new VsCodeTelemetryReporter(id, version, aiKey);
+ experimentTelemetryReporter = new ExperimentationTelemetryReporter(vscTelemetryReporter);
+ context.subscriptions.push(experimentTelemetryReporter);
+ }
+
const lazyClientHost = createLazyClientHost(context, false, {
pluginManager,
commandManager,
@@ -66,6 +78,7 @@ export function activate(
processFactory: WorkerServerProcess,
activeJsTsEditorTracker,
serviceConfigurationProvider: new BrowserServiceConfigurationProvider(),
+ experimentTelemetryReporter,
}, item => {
onCompletionAccepted.fire(item);
});
diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index f6576dabc0d..e6b971260d3 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -5,10 +5,12 @@
import * as fs from 'fs';
import * as vscode from 'vscode';
+import VsCodeTelemetryReporter from '@vscode/extension-telemetry';
import { Api, getExtensionApi } from './api';
import { CommandManager } from './commands/commandManager';
import { registerBaseCommands } from './commands/index';
import { ExperimentationService } from './experimentationService';
+import { ExperimentationTelemetryReporter, IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
import { nodeRequestCancellerFactory } from './tsServer/cancellation.electron';
import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron';
@@ -20,6 +22,7 @@ import { ElectronServiceConfigurationProvider } from './utils/configuration.elec
import { onCaseInsensitiveFileSystem } from './utils/fileSystem.electron';
import { PluginManager } from './utils/plugins';
import * as temp from './utils/temp.electron';
+import { getPackageInfo } from './utils/packageInfo';
export function activate(
context: vscode.ExtensionContext
@@ -42,6 +45,19 @@ export function activate(
const jsWalkthroughState = new JsWalkthroughState();
context.subscriptions.push(jsWalkthroughState);
+ let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
+ const packageInfo = getPackageInfo(context);
+ if (packageInfo) {
+ const { name: id, version, aiKey } = packageInfo;
+ const vscTelemetryReporter = new VsCodeTelemetryReporter(id, version, aiKey);
+ experimentTelemetryReporter = new ExperimentationTelemetryReporter(vscTelemetryReporter);
+ context.subscriptions.push(experimentTelemetryReporter);
+
+ // Currently we have no experiments, but creating the service adds the appropriate
+ // shared properties to the ExperimentationTelemetryReporter we just created.
+ new ExperimentationService(experimentTelemetryReporter, id, version, context.globalState);
+ }
+
const lazyClientHost = createLazyClientHost(context, onCaseInsensitiveFileSystem(), {
pluginManager,
commandManager,
@@ -51,6 +67,7 @@ export function activate(
processFactory: new ElectronServiceProcessFactory(),
activeJsTsEditorTracker,
serviceConfigurationProvider: new ElectronServiceConfigurationProvider(),
+ experimentTelemetryReporter,
}, item => {
onCompletionAccepted.fire(item);
});
@@ -58,9 +75,6 @@ export function activate(
registerBaseCommands(commandManager, lazyClientHost, pluginManager, activeJsTsEditorTracker);
registerJsNodeWalkthrough(commandManager, jsWalkthroughState);
- // Currently no variables in use.
- context.subscriptions.push(new ExperimentationService(context));
-
import('./task/taskProvider').then(module => {
context.subscriptions.push(module.register(lazyClientHost.map(x => x.serviceClient)));
});
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index a7b1e6c061c..2547b92e044 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -117,13 +117,9 @@ class MyCompletionItem extends vscode.CompletionItem {
if (tsEntry.kindModifiers) {
const kindModifiers = parseKindModifier(tsEntry.kindModifiers);
if (kindModifiers.has(PConst.KindModifiers.optional)) {
- if (!this.insertText) {
- this.insertText = this.textLabel;
- }
+ this.insertText ??= this.textLabel;
+ this.filterText ??= this.textLabel;
- if (!this.filterText) {
- this.filterText = this.textLabel;
- }
if (typeof this.label === 'string') {
this.label += '?';
} else {
@@ -521,7 +517,7 @@ class MyCompletionItem extends vscode.CompletionItem {
}
}
-function getScriptKindDetails(tsEntry: protocol.CompletionEntry,): string | undefined {
+function getScriptKindDetails(tsEntry: Proto.CompletionEntry,): string | undefined {
if (!tsEntry.kindModifiers || tsEntry.kind !== PConst.Kind.script) {
return;
}
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
index 68685848035..b9e9db47fe5 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
@@ -30,10 +30,7 @@ class FileReferencesCommand implements Command {
return;
}
- if (!resource) {
- resource = vscode.window.activeTextEditor?.document.uri;
- }
-
+ resource ??= vscode.window.activeTextEditor?.document.uri;
if (!resource) {
vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided."));
return;
diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
index 4882ae3ca59..7c6995ec7d5 100644
--- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
@@ -147,62 +147,47 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
return false;
}
- const enum Choice {
- None = 0,
- Accept = 1,
- Reject = 2,
- Always = 3,
- Never = 4,
- }
+ const rejectItem: vscode.MessageItem = {
+ title: localize('reject.title', "No"),
+ isCloseAffordance: true,
+ };
- interface Item extends vscode.MessageItem {
- readonly choice: Choice;
- }
+ const acceptItem: vscode.MessageItem = {
+ title: localize('accept.title', "Yes"),
+ };
+ const alwaysItem: vscode.MessageItem = {
+ title: localize('always.title', "Always automatically update imports"),
+ };
- const response = await vscode.window.showInformationMessage
- (
+ const neverItem: vscode.MessageItem = {
+ title: localize('never.title', "Never automatically update imports"),
+ };
+
+ const response = await vscode.window.showInformationMessage(
newResources.length === 1
? localize('prompt', "Update imports for '{0}'?", path.basename(newResources[0].fsPath))
: this.getConfirmMessage(localize('promptMoreThanOne', "Update imports for the following {0} files?", newResources.length), newResources), {
modal: true,
- }, {
- title: localize('reject.title', "No"),
- choice: Choice.Reject,
- isCloseAffordance: true,
- }, {
- title: localize('accept.title', "Yes"),
- choice: Choice.Accept,
- }, {
- title: localize('always.title', "Always automatically update imports"),
- choice: Choice.Always,
- }, {
- title: localize('never.title', "Never automatically update imports"),
- choice: Choice.Never,
- });
+ }, rejectItem, acceptItem, alwaysItem, neverItem);
- if (!response) {
- return false;
- }
- switch (response.choice) {
- case Choice.Accept:
- {
- return true;
- }
- case Choice.Reject:
- {
- return false;
- }
- case Choice.Always:
- {
- const config = this.getConfiguration(newResources[0]);
- config.update(
- updateImportsOnFileMoveName,
- UpdateImportsOnFileMoveSetting.Always,
- this.getConfigTargetScope(config, updateImportsOnFileMoveName));
- return true;
- }
- case Choice.Never:
+ switch (response) {
+ case acceptItem: {
+ return true;
+ }
+ case rejectItem: {
+ return false;
+ }
+ case alwaysItem: {
+ const config = this.getConfiguration(newResources[0]);
+ config.update(
+ updateImportsOnFileMoveName,
+ UpdateImportsOnFileMoveSetting.Always,
+ this.getConfigTargetScope(config, updateImportsOnFileMoveName));
+ return true;
+ }
+ case neverItem:
{
const config = this.getConfiguration(newResources[0]);
config.update(
@@ -211,9 +196,10 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
this.getConfigTargetScope(config, updateImportsOnFileMoveName));
return false;
}
+ default: {
+ return false;
+ }
}
-
- return false;
}
private async getJsTsFileBeingMoved(resource: vscode.Uri): Promise {
diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts
index 8ad2efac84c..377d9c09fa1 100644
--- a/extensions/typescript-language-features/src/lazyClientHost.ts
+++ b/extensions/typescript-language-features/src/lazyClientHost.ts
@@ -5,6 +5,7 @@
import * as vscode from 'vscode';
import { CommandManager } from './commands/commandManager';
+import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
import { OngoingRequestCancellerFactory } from './tsServer/cancellation';
import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
import { TsServerProcessFactory } from './tsServer/server';
@@ -30,6 +31,7 @@ export function createLazyClientHost(
processFactory: TsServerProcessFactory;
activeJsTsEditorTracker: ActiveJsTsEditorTracker;
serviceConfigurationProvider: ServiceConfigurationProvider;
+ experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
},
onCompletionAccepted: (item: vscode.CompletionItem) => void,
): Lazy {
diff --git a/extensions/typescript-language-features/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts
index 7e9e45f2575..1aec9e082ed 100644
--- a/extensions/typescript-language-features/src/protocol.d.ts
+++ b/extensions/typescript-language-features/src/protocol.d.ts
@@ -1,13 +1,19 @@
-import * as Proto from 'typescript/lib/protocol';
-export = Proto;
+import * as ts from 'typescript/lib/tsserverlibrary';
+export = ts.server.protocol;
+
declare enum ServerType {
Syntax = 'syntax',
Semantic = 'semantic',
}
-declare module 'typescript/lib/protocol' {
- interface Response {
- readonly _serverType?: ServerType;
+declare module 'typescript/lib/tsserverlibrary' {
+ namespace server.protocol {
+ type TextInsertion = ts.TextInsertion;
+ type ScriptElementKind = ts.ScriptElementKind;
+
+ interface Response {
+ readonly _serverType?: ServerType;
+ }
}
}
diff --git a/extensions/typescript-language-features/src/test/unit/previewer.test.ts b/extensions/typescript-language-features/src/test/unit/previewer.test.ts
index 2f7af37383b..75a4464610c 100644
--- a/extensions/typescript-language-features/src/test/unit/previewer.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/previewer.test.ts
@@ -5,7 +5,7 @@
import * as assert from 'assert';
import 'mocha';
-import { SymbolDisplayPart } from 'typescript/lib/protocol';
+import { SymbolDisplayPart } from '../../protocol';
import { Uri } from 'vscode';
import { IFilePathToResourceConverter, markdownDocumentation, plainWithLinks, tagsMarkdownPreview } from '../../utils/previewer';
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index c8635b2f668..6c2168a380c 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -10,6 +10,7 @@
import * as vscode from 'vscode';
import { CommandManager } from './commands/commandManager';
+import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
import { DiagnosticKind } from './languageFeatures/diagnostics';
import FileConfigurationManager from './languageFeatures/fileConfigurationManager';
import LanguageProvider from './languageProvider';
@@ -72,6 +73,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
processFactory: TsServerProcessFactory;
activeJsTsEditorTracker: ActiveJsTsEditorTracker;
serviceConfigurationProvider: ServiceConfigurationProvider;
+ experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
},
onCompletionAccepted: (item: vscode.CompletionItem) => void,
) {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index a42f5c29f06..169df72d203 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -6,6 +6,7 @@
import * as path from 'path';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
+import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
import { DiagnosticKind, DiagnosticsManager } from './languageFeatures/diagnostics';
import * as Proto from './protocol';
import { EventName } from './protocol.const';
@@ -137,6 +138,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
versionProvider: ITypeScriptVersionProvider;
processFactory: TsServerProcessFactory;
serviceConfigurationProvider: ServiceConfigurationProvider;
+ experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined;
},
allModeIds: readonly string[]
) {
@@ -205,14 +207,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType
}
}, this, this._disposables);
- this.telemetryReporter = this._register(new VSCodeTelemetryReporter(() => {
+ this.telemetryReporter = new VSCodeTelemetryReporter(services.experimentTelemetryReporter, () => {
if (this.serverState.type === ServerState.Type.Running) {
if (this.serverState.tsserverVersion) {
return this.serverState.tsserverVersion;
}
}
return this.apiVersion.fullVersionString;
- }));
+ });
this.typescriptServerSpawner = new TypeScriptServerSpawner(this.versionProvider, this._versionManager, this.logDirectoryProvider, this.pluginPathsProvider, this.logger, this.telemetryReporter, this.tracer, this.processFactory);
diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts
index efa442a5d0d..d1bfe62f738 100644
--- a/extensions/typescript-language-features/src/utils/configuration.ts
+++ b/extensions/typescript-language-features/src/utils/configuration.ts
@@ -5,6 +5,7 @@
import * as vscode from 'vscode';
import * as objects from '../utils/objects';
+import * as Proto from '../protocol';
export enum TsServerLogLevel {
Off,
@@ -112,7 +113,7 @@ export interface TypeScriptServiceConfiguration {
readonly enableProjectDiagnostics: boolean;
readonly maxTsServerMemory: number;
readonly enablePromptUseWorkspaceTsdk: boolean;
- readonly watchOptions: protocol.WatchOptions | undefined;
+ readonly watchOptions: Proto.WatchOptions | undefined;
readonly includePackageJsonAutoImports: 'auto' | 'on' | 'off' | undefined;
readonly enableTsServerTracing: boolean;
}
@@ -196,8 +197,8 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
return configuration.get('typescript.tsserver.experimental.enableProjectDiagnostics', false);
}
- protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): protocol.WatchOptions | undefined {
- return configuration.get('typescript.tsserver.watchOptions');
+ protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined {
+ return configuration.get('typescript.tsserver.watchOptions');
}
protected readIncludePackageJsonAutoImports(configuration: vscode.WorkspaceConfiguration): 'auto' | 'on' | 'off' | undefined {
diff --git a/extensions/typescript-language-features/src/utils/dependentRegistration.ts b/extensions/typescript-language-features/src/utils/dependentRegistration.ts
index 3d97b8a8e7f..c53d553625c 100644
--- a/extensions/typescript-language-features/src/utils/dependentRegistration.ts
+++ b/extensions/typescript-language-features/src/utils/dependentRegistration.ts
@@ -54,14 +54,10 @@ class ConditionalRegistration {
private update() {
const enabled = this.conditions.every(condition => condition.value);
if (enabled) {
- if (!this.registration) {
- this.registration = this.doRegister();
- }
+ this.registration ??= this.doRegister();
} else {
- if (this.registration) {
- this.registration.dispose();
- this.registration = undefined;
- }
+ this.registration?.dispose();
+ this.registration = undefined;
}
}
}
diff --git a/extensions/typescript-language-features/src/utils/packageInfo.ts b/extensions/typescript-language-features/src/utils/packageInfo.ts
new file mode 100644
index 00000000000..09536ab4141
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/packageInfo.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+export interface PackageInfo {
+ name: string;
+ version: string;
+ aiKey: string;
+}
+
+export function getPackageInfo(context: vscode.ExtensionContext) {
+ const packageJSON = context.extension.packageJSON;
+ if (packageJSON && typeof packageJSON === 'object') {
+ return {
+ name: packageJSON.name ?? '',
+ version: packageJSON.version ?? '',
+ aiKey: packageJSON.aiKey ?? '',
+ };
+ }
+ return null;
+}
diff --git a/extensions/typescript-language-features/src/utils/plugins.ts b/extensions/typescript-language-features/src/utils/plugins.ts
index 697e5422445..814f0e12016 100644
--- a/extensions/typescript-language-features/src/utils/plugins.ts
+++ b/extensions/typescript-language-features/src/utils/plugins.ts
@@ -28,7 +28,7 @@ namespace TypeScriptServerPlugin {
export class PluginManager extends Disposable {
private readonly _pluginConfigurations = new Map();
- private _plugins: Map> | undefined;
+ private _plugins?: Map>;
constructor() {
super();
@@ -37,6 +37,7 @@ export class PluginManager extends Disposable {
if (!this._plugins) {
return;
}
+
const newPlugins = this.readPlugins();
if (!arrays.equals(Array.from(this._plugins.values()).flat(), Array.from(newPlugins.values()).flat(), TypeScriptServerPlugin.equals)) {
this._plugins = newPlugins;
@@ -46,9 +47,7 @@ export class PluginManager extends Disposable {
}
public get plugins(): ReadonlyArray {
- if (!this._plugins) {
- this._plugins = this.readPlugins();
- }
+ this._plugins ??= this.readPlugins();
return Array.from(this._plugins.values()).flat();
}
diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts
index a4a42086d17..1564cdd92dd 100644
--- a/extensions/typescript-language-features/src/utils/previewer.ts
+++ b/extensions/typescript-language-features/src/utils/previewer.ts
@@ -84,7 +84,7 @@ function getTagDocumentation(
case 'extends':
case 'param':
case 'template': {
- const body = (convertLinkTags(tag.text, filePathConverter)).split(/^(\S+)\s*-?\s*/);
+ const body = getTagBody(tag, filePathConverter);
if (body?.length === 3) {
const param = body[1];
const doc = body[2];
@@ -106,6 +106,18 @@ function getTagDocumentation(
return label + (text.match(/\r\n|\n/g) ? ' \n' + text : ` \u2014 ${text}`);
}
+function getTagBody(tag: Proto.JSDocTagInfo, filePathConverter: IFilePathToResourceConverter): Array | undefined {
+ if (tag.name === 'template') {
+ const parts = tag.text;
+ if (parts && typeof (parts) !== 'string') {
+ const params = parts.filter(p => p.kind === 'typeParameterName').map(p => p.text).join(', ');
+ const docs = parts.filter(p => p.kind === 'text').map(p => convertLinkTags(p.text.replace(/^\s*-?\s*/, ''), filePathConverter)).join(' ');
+ return params ? ['', params, docs] : undefined;
+ }
+ }
+ return (convertLinkTags(tag.text, filePathConverter)).split(/^(\S+)\s*-?\s*/);
+}
+
export function plainWithLinks(
parts: readonly Proto.SymbolDisplayPart[] | string,
filePathConverter: IFilePathToResourceConverter,
diff --git a/extensions/typescript-language-features/src/utils/telemetry.ts b/extensions/typescript-language-features/src/utils/telemetry.ts
index da7ee73cad0..4b2d3867f6d 100644
--- a/extensions/typescript-language-features/src/utils/telemetry.ts
+++ b/extensions/typescript-language-features/src/utils/telemetry.ts
@@ -3,15 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import * as vscode from 'vscode';
-import VsCodeTelemetryReporter from '@vscode/extension-telemetry';
-import { memoize } from './memoize';
-
-interface PackageInfo {
- readonly name: string;
- readonly version: string;
- readonly aiKey: string;
-}
+import { IExperimentationTelemetryReporter } from '../experimentTelemetryReporter';
export interface TelemetryProperties {
readonly [prop: string]: string | number | boolean | undefined;
@@ -19,14 +11,11 @@ export interface TelemetryProperties {
export interface TelemetryReporter {
logTelemetry(eventName: string, properties?: TelemetryProperties): void;
-
- dispose(): void;
}
export class VSCodeTelemetryReporter implements TelemetryReporter {
- private _reporter: VsCodeTelemetryReporter | null = null;
-
constructor(
+ private readonly reporter: IExperimentationTelemetryReporter | undefined,
private readonly clientVersionDelegate: () => string
) { }
@@ -43,38 +32,6 @@ export class VSCodeTelemetryReporter implements TelemetryReporter {
*/
properties['version'] = this.clientVersionDelegate();
- reporter.sendTelemetryEvent(eventName, properties);
- }
-
- public dispose() {
- if (this._reporter) {
- this._reporter.dispose();
- this._reporter = null;
- }
- }
-
- @memoize
- private get reporter(): VsCodeTelemetryReporter | null {
- if (this.packageInfo?.aiKey) {
- this._reporter = new VsCodeTelemetryReporter(
- this.packageInfo.name,
- this.packageInfo.version,
- this.packageInfo.aiKey);
- return this._reporter;
- }
- return null;
- }
-
- @memoize
- private get packageInfo(): PackageInfo | null {
- const { packageJSON } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
- if (packageJSON) {
- return {
- name: packageJSON.name,
- version: packageJSON.version,
- aiKey: packageJSON.aiKey
- };
- }
- return null;
+ reporter.postEventObj(eventName, properties);
}
}
diff --git a/extensions/typescript-language-features/src/utils/temp.electron.ts b/extensions/typescript-language-features/src/utils/temp.electron.ts
index 84fc21ff885..886c8f014fe 100644
--- a/extensions/typescript-language-features/src/utils/temp.electron.ts
+++ b/extensions/typescript-language-features/src/utils/temp.electron.ts
@@ -34,9 +34,7 @@ const getRootTempDir = (() => {
export const getInstanceTempDir = (() => {
let dir: string | undefined;
return () => {
- if (!dir) {
- dir = path.join(getRootTempDir(), makeRandomHexString(20));
- }
+ dir ??= path.join(getRootTempDir(), makeRandomHexString(20));
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir);
}
diff --git a/extensions/typescript-language-features/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts
index baf1d4fd59b..1c71d659126 100644
--- a/extensions/typescript-language-features/src/utils/tsconfig.ts
+++ b/extensions/typescript-language-features/src/utils/tsconfig.ts
@@ -163,7 +163,7 @@ export async function openProjectConfigForFile(
return;
}
- let res: ServerResponse.Response | undefined;
+ let res: ServerResponse.Response | undefined;
try {
res = await client.execute('projectInfo', { file, needFileNameList: false }, nulToken);
} catch {
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
index 08e22bf4c15..89f3521b9b6 100644
--- a/extensions/typescript-language-features/yarn.lock
+++ b/extensions/typescript-language-features/yarn.lock
@@ -85,10 +85,10 @@ tas-client@0.1.58:
dependencies:
axios "^0.26.1"
-vscode-nls@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.1.0.tgz#443b301a7465d88c81c0f4e1914f9857f0dce1e4"
- integrity sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==
+vscode-nls@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+ integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
vscode-tas-client@^0.1.63:
version "0.1.63"
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 07e71c1daaf..b38c61cd6d2 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -20,7 +20,6 @@
"notebookCellExecutionState",
"notebookContentProvider",
"notebookControllerKind",
- "notebookDebugOptions",
"notebookDeprecated",
"notebookLiveShare",
"notebookMessaging",
@@ -34,6 +33,7 @@
"taskPresentationGroup",
"terminalDataWriteEvent",
"terminalDimensions",
+ "tunnels",
"envShellEvent",
"testCoverage",
"testObserver",
@@ -44,6 +44,7 @@
"treeViewReveal",
"workspaceTrust",
"telemetry",
+ "extensionLog",
"localization"
],
"private": true,
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
index a445753483d..d02e5a44442 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
@@ -32,7 +32,7 @@ suite('vscode API - env', () => {
test('env.remoteName', function () {
const remoteName = env.remoteName;
const knownWorkspaceExtension = extensions.getExtension('vscode.git');
- const knownUiAndWorkspaceExtension = extensions.getExtension('vscode.image-preview');
+ const knownUiAndWorkspaceExtension = extensions.getExtension('vscode.media-preview');
if (typeof remoteName === 'undefined') {
// not running in remote, so we expect both extensions
assert.ok(knownWorkspaceExtension);
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
index 75021ecfe32..3989f39d021 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
@@ -40,9 +40,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -479,4 +479,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
index dae875b1f49..b7b57e957c9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
@@ -40,9 +40,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -52,9 +52,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -251,4 +251,4 @@
"hc_light": "default: #292929"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
index d80f8d84182..ed95595fd58 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
@@ -76,9 +76,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -196,9 +196,9 @@
"t": "text.html.derivative meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -388,9 +388,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -652,9 +652,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -772,9 +772,9 @@
"t": "text.html.derivative meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -964,9 +964,9 @@
"t": "text.html.derivative meta.tag.structure.body.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
index 98c382df18b..4ec8289167e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
@@ -4,9 +4,9 @@
"t": "text.pug entity.other.attribute-name.class.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -23,4 +23,4 @@
"hc_light": "string.comment.buffered.block.pug: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
index 95e8817adcb..e2b4189dbc2 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
@@ -28,9 +28,9 @@
"t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -88,9 +88,9 @@
"t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -148,9 +148,9 @@
"t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -316,9 +316,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -388,9 +388,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -635,4 +635,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
index d13d4367a82..419443b11de 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
@@ -64,9 +64,9 @@
"t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -76,9 +76,9 @@
"t": "source.css.less meta.property-list.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -160,9 +160,9 @@
"t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -172,9 +172,9 @@
"t": "source.css.less meta.property-list.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -400,9 +400,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
index 6e922a532cd..ee81512b5ca 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
@@ -64,9 +64,9 @@
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -148,9 +148,9 @@
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -268,9 +268,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -376,9 +376,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -508,9 +508,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
index a48d921ebaa..b22ea1d7793 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
@@ -268,9 +268,9 @@
"t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -424,9 +424,9 @@
"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -508,9 +508,9 @@
"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -592,9 +592,9 @@
"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.drag.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -724,9 +724,9 @@
"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -868,9 +868,9 @@
"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1012,9 +1012,9 @@
"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
index 4140c9f0b45..e05badae2cf 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
@@ -508,9 +508,9 @@
"t": "source.coffee string.regexp.multiline.coffee source.coffee.embedded.source",
"r": {
"dark_plus": "source.coffee.embedded: #9CDCFE",
- "light_plus": "source.coffee.embedded: #FF0000",
+ "light_plus": "source.coffee.embedded: #E50000",
"dark_vs": "source.coffee.embedded: #9CDCFE",
- "light_vs": "source.coffee.embedded: #FF0000",
+ "light_vs": "source.coffee.embedded: #E50000",
"hc_black": "source.coffee.embedded: #D4D4D4",
"hc_light": "source.coffee.embedded: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
index 4bc08534cae..f2bb411df60 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
@@ -64,9 +64,9 @@
"t": "source.css meta.property-list.css variable.css",
"r": {
"dark_plus": "variable.css: #9CDCFE",
- "light_plus": "variable.css: #FF0000",
+ "light_plus": "variable.css: #E50000",
"dark_vs": "variable.css: #9CDCFE",
- "light_vs": "variable.css: #FF0000",
+ "light_vs": "variable.css: #E50000",
"hc_black": "variable.css: #D4D4D4",
"hc_light": "variable.css: #264F78"
}
@@ -148,9 +148,9 @@
"t": "source.css meta.property-list.css variable.css",
"r": {
"dark_plus": "variable.css: #9CDCFE",
- "light_plus": "variable.css: #FF0000",
+ "light_plus": "variable.css: #E50000",
"dark_vs": "variable.css: #9CDCFE",
- "light_vs": "variable.css: #FF0000",
+ "light_vs": "variable.css: #E50000",
"hc_black": "variable.css: #D4D4D4",
"hc_light": "variable.css: #264F78"
}
@@ -352,9 +352,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
index 37474def82e..c173079cd2a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
@@ -354,7 +354,7 @@
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "source.coffee.embedded: #9CDCFE",
- "light_vs": "source.coffee.embedded: #FF0000",
+ "light_vs": "source.coffee.embedded: #E50000",
"hc_black": "variable: #9CDCFE",
"hc_light": "variable: #001080"
}
@@ -642,7 +642,7 @@
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "source.coffee.embedded: #9CDCFE",
- "light_vs": "source.coffee.embedded: #FF0000",
+ "light_vs": "source.coffee.embedded: #E50000",
"hc_black": "variable: #9CDCFE",
"hc_light": "variable: #001080"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
index eefa012ecba..16e42371716 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
@@ -1,7 +1,19 @@
[
{
- "c": "@{",
- "t": "text.html.cshtml keyword.control.cshtml",
+ "c": "@",
+ "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "{",
+ "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.open",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
@@ -13,7 +25,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -25,7 +37,7 @@
},
{
"c": "var",
- "t": "text.html.cshtml keyword.other.var.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
@@ -37,7 +49,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -49,7 +61,7 @@
},
{
"c": "total",
- "t": "text.html.cshtml entity.name.variable.local.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs entity.name.variable.local.cs",
"r": {
"dark_plus": "entity.name.variable: #9CDCFE",
"light_plus": "entity.name.variable: #001080",
@@ -61,7 +73,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -73,7 +85,7 @@
},
{
"c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.operator.assignment.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -85,7 +97,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -97,7 +109,7 @@
},
{
"c": "0",
- "t": "text.html.cshtml constant.numeric.decimal.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs constant.numeric.decimal.cs",
"r": {
"dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658",
@@ -109,7 +121,7 @@
},
{
"c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs punctuation.terminator.statement.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -121,7 +133,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -133,7 +145,7 @@
},
{
"c": "var",
- "t": "text.html.cshtml keyword.other.var.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
@@ -145,7 +157,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -157,7 +169,7 @@
},
{
"c": "totalMessage",
- "t": "text.html.cshtml entity.name.variable.local.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs entity.name.variable.local.cs",
"r": {
"dark_plus": "entity.name.variable: #9CDCFE",
"light_plus": "entity.name.variable: #001080",
@@ -169,7 +181,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -181,7 +193,7 @@
},
{
"c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.operator.assignment.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -193,7 +205,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -205,7 +217,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs string.quoted.double.cs punctuation.definition.string.begin.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -217,7 +229,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs string.quoted.double.cs punctuation.definition.string.end.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -229,235 +241,7 @@
},
{
"c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": " @",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "*",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "a",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "multiline",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "razor",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "comment",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "embedded",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "in",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "csharp",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "*",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "@",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs punctuation.terminator.statement.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -469,7 +253,91 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs",
+ "r": {
+ "dark_plus": "default: #D4D4D4",
+ "light_plus": "default: #000000",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "default: #FFFFFF",
+ "hc_light": "default: #292929"
+ }
+ },
+ {
+ "c": "@",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "*",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": " a multiline",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor comment.block.razor",
+ "r": {
+ "dark_plus": "comment: #6A9955",
+ "light_plus": "comment: #008000",
+ "dark_vs": "comment: #6A9955",
+ "light_vs": "comment: #008000",
+ "hc_black": "comment: #7CA668",
+ "hc_light": "comment: #515151"
+ }
+ },
+ {
+ "c": " razor comment embedded in csharp ",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor comment.block.razor",
+ "r": {
+ "dark_plus": "comment: #6A9955",
+ "light_plus": "comment: #008000",
+ "dark_vs": "comment: #6A9955",
+ "light_vs": "comment: #008000",
+ "hc_black": "comment: #7CA668",
+ "hc_light": "comment: #515151"
+ }
+ },
+ {
+ "c": "*",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "@",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": " ",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -481,7 +349,7 @@
},
{
"c": "if",
- "t": "text.html.cshtml keyword.control.conditional.if.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor keyword.control.conditional.if.cs",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
@@ -493,7 +361,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -505,7 +373,7 @@
},
{
"c": "(",
- "t": "text.html.cshtml punctuation.parenthesis.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor punctuation.parenthesis.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -517,7 +385,7 @@
},
{
"c": "IsPost",
- "t": "text.html.cshtml variable.other.readwrite.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor variable.other.readwrite.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -529,7 +397,7 @@
},
{
"c": ")",
- "t": "text.html.cshtml punctuation.parenthesis.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor punctuation.parenthesis.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -541,7 +409,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -553,7 +421,7 @@
},
{
"c": "{",
- "t": "text.html.cshtml punctuation.curlybrace.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.curlybrace.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -565,7 +433,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml punctuation.whitespace.comment.leading.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -577,7 +445,7 @@
},
{
"c": "//",
- "t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.definition.comment.cs",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
@@ -589,7 +457,7 @@
},
{
"c": " Retrieve the numbers that the user entered.",
- "t": "text.html.cshtml comment.line.double-slash.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
@@ -601,7 +469,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -613,7 +481,7 @@
},
{
"c": "var",
- "t": "text.html.cshtml keyword.other.var.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
@@ -625,7 +493,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -637,7 +505,7 @@
},
{
"c": "num1",
- "t": "text.html.cshtml entity.name.variable.local.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.variable.local.cs",
"r": {
"dark_plus": "entity.name.variable: #9CDCFE",
"light_plus": "entity.name.variable: #001080",
@@ -649,7 +517,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -661,7 +529,7 @@
},
{
"c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -673,7 +541,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -685,7 +553,7 @@
},
{
"c": "Request",
- "t": "text.html.cshtml variable.other.object.property.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.property.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -697,7 +565,7 @@
},
{
"c": "[",
- "t": "text.html.cshtml punctuation.squarebracket.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -709,7 +577,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.begin.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -721,7 +589,7 @@
},
{
"c": "text1",
- "t": "text.html.cshtml string.quoted.double.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -733,7 +601,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.end.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -745,7 +613,7 @@
},
{
"c": "]",
- "t": "text.html.cshtml punctuation.squarebracket.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -757,7 +625,7 @@
},
{
"c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -769,7 +637,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -781,7 +649,7 @@
},
{
"c": "var",
- "t": "text.html.cshtml keyword.other.var.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
@@ -793,7 +661,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -805,7 +673,7 @@
},
{
"c": "num2",
- "t": "text.html.cshtml entity.name.variable.local.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.variable.local.cs",
"r": {
"dark_plus": "entity.name.variable: #9CDCFE",
"light_plus": "entity.name.variable: #001080",
@@ -817,7 +685,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -829,7 +697,7 @@
},
{
"c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -841,7 +709,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -853,7 +721,7 @@
},
{
"c": "Request",
- "t": "text.html.cshtml variable.other.object.property.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.property.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -865,7 +733,7 @@
},
{
"c": "[",
- "t": "text.html.cshtml punctuation.squarebracket.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -877,7 +745,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.begin.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -889,7 +757,7 @@
},
{
"c": "text2",
- "t": "text.html.cshtml string.quoted.double.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -901,7 +769,7 @@
},
{
"c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.end.cs",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@@ -913,7 +781,7 @@
},
{
"c": "]",
- "t": "text.html.cshtml punctuation.squarebracket.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -925,7 +793,7 @@
},
{
"c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -937,7 +805,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml punctuation.whitespace.comment.leading.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -949,7 +817,7 @@
},
{
"c": "//",
- "t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.definition.comment.cs",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
@@ -961,7 +829,7 @@
},
{
"c": " Convert the entered strings into integers numbers and add.",
- "t": "text.html.cshtml comment.line.double-slash.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
@@ -973,7 +841,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -985,7 +853,7 @@
},
{
"c": "total",
- "t": "text.html.cshtml variable.other.readwrite.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.readwrite.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -997,7 +865,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1009,7 +877,7 @@
},
{
"c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -1021,7 +889,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1033,7 +901,7 @@
},
{
"c": "num1",
- "t": "text.html.cshtml variable.other.object.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -1045,7 +913,7 @@
},
{
"c": ".",
- "t": "text.html.cshtml punctuation.accessor.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.accessor.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1057,7 +925,7 @@
},
{
"c": "AsInt",
- "t": "text.html.cshtml entity.name.function.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.function.cs",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
@@ -1069,7 +937,7 @@
},
{
"c": "(",
- "t": "text.html.cshtml punctuation.parenthesis.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1081,7 +949,7 @@
},
{
"c": ")",
- "t": "text.html.cshtml punctuation.parenthesis.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1093,7 +961,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1105,7 +973,7 @@
},
{
"c": "+",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.arithmetic.cs",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
@@ -1117,7 +985,7 @@
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1129,7 +997,7 @@
},
{
"c": "num2",
- "t": "text.html.cshtml variable.other.object.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.cs",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -1141,7 +1009,7 @@
},
{
"c": ".",
- "t": "text.html.cshtml punctuation.accessor.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.accessor.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1153,7 +1021,7 @@
},
{
"c": "AsInt",
- "t": "text.html.cshtml entity.name.function.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.function.cs",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
@@ -1165,7 +1033,7 @@
},
{
"c": "(",
- "t": "text.html.cshtml punctuation.parenthesis.open.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.open.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1177,7 +1045,7 @@
},
{
"c": ")",
- "t": "text.html.cshtml punctuation.parenthesis.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1189,7 +1057,7 @@
},
{
"c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1201,7 +1069,7 @@
},
{
"c": "\t\t",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1213,295 +1081,163 @@
},
{
"c": "<",
- "t": "text.html.cshtml keyword.operator.relational.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.begin.html",
"r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
}
},
{
"c": "italic",
- "t": "text.html.cshtml variable.other.readwrite.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.tag.html",
"r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": "><",
- "t": "text.html.cshtml keyword.operator.relational.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "bold",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
+ "dark_plus": "entity.name.tag: #569CD6",
+ "light_plus": "entity.name.tag: #800000",
+ "dark_vs": "entity.name.tag: #569CD6",
+ "light_vs": "entity.name.tag: #800000",
+ "hc_black": "entity.name.tag: #569CD6",
+ "hc_light": "entity.name.tag: #0F4A85"
}
},
{
"c": ">",
- "t": "text.html.cshtml keyword.operator.relational.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html",
"r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "totalMessage",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "=",
- "t": "text.html.cshtml keyword.operator.assignment.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs",
- "r": {
- "dark_plus": "string: #CE9178",
- "light_plus": "string: #A31515",
- "dark_vs": "string: #CE9178",
- "light_vs": "string: #A31515",
- "hc_black": "string: #CE9178",
- "hc_light": "string: #0F4A85"
- }
- },
- {
- "c": "Total = ",
- "t": "text.html.cshtml string.quoted.double.cs",
- "r": {
- "dark_plus": "string: #CE9178",
- "light_plus": "string: #A31515",
- "dark_vs": "string: #CE9178",
- "light_vs": "string: #A31515",
- "hc_black": "string: #CE9178",
- "hc_light": "string: #0F4A85"
- }
- },
- {
- "c": "\"",
- "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs",
- "r": {
- "dark_plus": "string: #CE9178",
- "light_plus": "string: #A31515",
- "dark_vs": "string: #CE9178",
- "light_vs": "string: #A31515",
- "hc_black": "string: #CE9178",
- "hc_light": "string: #0F4A85"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "+",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "total",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": ";",
- "t": "text.html.cshtml punctuation.terminator.statement.cs",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
}
},
{
"c": "<",
- "t": "text.html.cshtml keyword.operator.relational.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.begin.html",
"r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "/",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
}
},
{
"c": "bold",
- "t": "text.html.cshtml variable.other.readwrite.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.tag.html",
"r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
- }
- },
- {
- "c": "><",
- "t": "text.html.cshtml keyword.operator.relational.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "/",
- "t": "text.html.cshtml keyword.operator.arithmetic.cs",
- "r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
- }
- },
- {
- "c": "italic",
- "t": "text.html.cshtml variable.other.readwrite.cs",
- "r": {
- "dark_plus": "variable: #9CDCFE",
- "light_plus": "variable: #001080",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "variable: #9CDCFE",
- "hc_light": "variable: #001080"
+ "dark_plus": "entity.name.tag: #569CD6",
+ "light_plus": "entity.name.tag: #800000",
+ "dark_vs": "entity.name.tag: #569CD6",
+ "light_vs": "entity.name.tag: #800000",
+ "hc_black": "entity.name.tag: #569CD6",
+ "hc_light": "entity.name.tag: #0F4A85"
}
},
{
"c": ">",
- "t": "text.html.cshtml keyword.operator.relational.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html",
"r": {
- "dark_plus": "keyword.operator: #D4D4D4",
- "light_plus": "keyword.operator: #000000",
- "dark_vs": "keyword.operator: #D4D4D4",
- "light_vs": "keyword.operator: #000000",
- "hc_black": "keyword.operator: #D4D4D4",
- "hc_light": "keyword.operator: #000000"
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
+ }
+ },
+ {
+ "c": "totalMessage = \"Total = \" + total;",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
+ "r": {
+ "dark_plus": "default: #D4D4D4",
+ "light_plus": "default: #000000",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "default: #FFFFFF",
+ "hc_light": "default: #292929"
+ }
+ },
+ {
+ "c": "",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html",
+ "r": {
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
+ }
+ },
+ {
+ "c": "",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html",
+ "r": {
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
}
},
{
"c": " ",
- "t": "text.html.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1513,7 +1249,7 @@
},
{
"c": "}",
- "t": "text.html.cshtml punctuation.curlybrace.close.cs",
+ "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.curlybrace.close.cs",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1525,7 +1261,7 @@
},
{
"c": "}",
- "t": "text.html.cshtml keyword.control.cshtml",
+ "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.close",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
@@ -1576,9 +1312,9 @@
"t": "text.html.cshtml meta.tag.metadata.doctype.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1636,9 +1372,9 @@
"t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1900,9 +1636,9 @@
"t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2308,9 +2044,9 @@
"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2368,9 +2104,9 @@
"t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2524,9 +2260,9 @@
"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2692,9 +2428,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2764,9 +2500,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2980,9 +2716,9 @@
"t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3148,9 +2884,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3220,9 +2956,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3436,9 +3172,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3508,9 +3244,9 @@
"t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3672,7 +3408,7 @@
}
},
{
- "c": "\t@* now we call the totalMessage method",
+ "c": "\t",
"t": "text.html.cshtml",
"r": {
"dark_plus": "default: #D4D4D4",
@@ -3684,68 +3420,8 @@
}
},
{
- "c": "\t (a multi line razor comment outside code) *@",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": " ",
- "t": "text.html.cshtml",
- "r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
- }
- },
- {
- "c": "<",
- "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
- "r": {
- "dark_plus": "punctuation.definition.tag: #808080",
- "light_plus": "punctuation.definition.tag: #800000",
- "dark_vs": "punctuation.definition.tag: #808080",
- "light_vs": "punctuation.definition.tag: #800000",
- "hc_black": "punctuation.definition.tag: #808080",
- "hc_light": "punctuation.definition.tag: #0F4A85"
- }
- },
- {
- "c": "p",
- "t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
- "r": {
- "dark_plus": "entity.name.tag: #569CD6",
- "light_plus": "entity.name.tag: #800000",
- "dark_vs": "entity.name.tag: #569CD6",
- "light_vs": "entity.name.tag: #800000",
- "hc_black": "entity.name.tag: #569CD6",
- "hc_light": "entity.name.tag: #0F4A85"
- }
- },
- {
- "c": ">",
- "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
- "r": {
- "dark_plus": "punctuation.definition.tag: #808080",
- "light_plus": "punctuation.definition.tag: #800000",
- "dark_vs": "punctuation.definition.tag: #808080",
- "light_vs": "punctuation.definition.tag: #800000",
- "hc_black": "punctuation.definition.tag: #808080",
- "hc_light": "punctuation.definition.tag: #0F4A85"
- }
- },
- {
- "c": "@totalMessage",
- "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml",
+ "c": "@",
+ "t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
@@ -3756,15 +3432,63 @@
}
},
{
- "c": "",
- "t": "text.html.cshtml meta.expression.implicit.cshtml",
+ "c": "*",
+ "t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star",
"r": {
- "dark_plus": "default: #D4D4D4",
- "light_plus": "default: #000000",
- "dark_vs": "default: #D4D4D4",
- "light_vs": "default: #000000",
- "hc_black": "default: #FFFFFF",
- "hc_light": "default: #292929"
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": " now we call the totalMessage method",
+ "t": "text.html.cshtml meta.comment.razor comment.block.razor",
+ "r": {
+ "dark_plus": "comment: #6A9955",
+ "light_plus": "comment: #008000",
+ "dark_vs": "comment: #6A9955",
+ "light_vs": "comment: #008000",
+ "hc_black": "comment: #7CA668",
+ "hc_light": "comment: #515151"
+ }
+ },
+ {
+ "c": "\t (a multi line razor comment outside code) ",
+ "t": "text.html.cshtml meta.comment.razor comment.block.razor",
+ "r": {
+ "dark_plus": "comment: #6A9955",
+ "light_plus": "comment: #008000",
+ "dark_vs": "comment: #6A9955",
+ "light_vs": "comment: #008000",
+ "hc_black": "comment: #7CA668",
+ "hc_light": "comment: #515151"
+ }
+ },
+ {
+ "c": "*",
+ "t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "@",
+ "t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
}
},
{
@@ -3816,7 +3540,127 @@
}
},
{
- "c": "@(",
+ "c": "@",
+ "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "totalMessage",
+ "t": "text.html.cshtml meta.expression.implicit.cshtml source.cs variable.other.object.cs",
+ "r": {
+ "dark_plus": "variable: #9CDCFE",
+ "light_plus": "variable: #001080",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "variable: #9CDCFE",
+ "hc_light": "variable: #001080"
+ }
+ },
+ {
+ "c": "",
+ "t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html",
+ "r": {
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
+ }
+ },
+ {
+ "c": " ",
+ "t": "text.html.cshtml",
+ "r": {
+ "dark_plus": "default: #D4D4D4",
+ "light_plus": "default: #000000",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "default: #FFFFFF",
+ "hc_light": "default: #292929"
+ }
+ },
+ {
+ "c": "<",
+ "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html",
+ "r": {
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
+ }
+ },
+ {
+ "c": "p",
+ "t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html",
+ "r": {
+ "dark_plus": "entity.name.tag: #569CD6",
+ "light_plus": "entity.name.tag: #800000",
+ "dark_vs": "entity.name.tag: #569CD6",
+ "light_vs": "entity.name.tag: #800000",
+ "hc_black": "entity.name.tag: #569CD6",
+ "hc_light": "entity.name.tag: #0F4A85"
+ }
+ },
+ {
+ "c": ">",
+ "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html",
+ "r": {
+ "dark_plus": "punctuation.definition.tag: #808080",
+ "light_plus": "punctuation.definition.tag: #800000",
+ "dark_vs": "punctuation.definition.tag: #808080",
+ "light_vs": "punctuation.definition.tag: #800000",
+ "hc_black": "punctuation.definition.tag: #808080",
+ "hc_light": "punctuation.definition.tag: #0F4A85"
+ }
+ },
+ {
+ "c": "@",
+ "t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml.transition",
+ "r": {
+ "dark_plus": "keyword.control: #C586C0",
+ "light_plus": "keyword.control: #AF00DB",
+ "dark_vs": "keyword.control: #569CD6",
+ "light_vs": "keyword.control: #0000FF",
+ "hc_black": "keyword.control: #C586C0",
+ "hc_light": "keyword.control: #B5200D"
+ }
+ },
+ {
+ "c": "(",
"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml",
"r": {
"dark_plus": "keyword.control: #C586C0",
@@ -3936,7 +3780,7 @@
}
},
{
- "c": " An email address (with escaped at character): name@",
+ "c": " An email address (with escaped at character): name",
"t": "text.html.cshtml",
"r": {
"dark_plus": "default: #D4D4D4",
@@ -3948,15 +3792,27 @@
}
},
{
- "c": "@domain.com",
- "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml",
+ "c": "@@",
+ "t": "text.html.cshtml constant.character.escape.razor.transition",
"r": {
- "dark_plus": "keyword.control: #C586C0",
- "light_plus": "keyword.control: #AF00DB",
- "dark_vs": "keyword.control: #569CD6",
- "light_vs": "keyword.control: #0000FF",
- "hc_black": "keyword.control: #C586C0",
- "hc_light": "keyword.control: #B5200D"
+ "dark_plus": "constant.character.escape: #D7BA7D",
+ "light_plus": "constant.character.escape: #EE0000",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "constant.character: #569CD6",
+ "hc_light": "constant.character.escape: #EE0000"
+ }
+ },
+ {
+ "c": "domain.com",
+ "t": "text.html.cshtml",
+ "r": {
+ "dark_plus": "default: #D4D4D4",
+ "light_plus": "default: #000000",
+ "dark_vs": "default: #D4D4D4",
+ "light_vs": "default: #000000",
+ "hc_black": "default: #FFFFFF",
+ "hc_light": "default: #292929"
}
},
{
@@ -4031,4 +3887,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
index 3278b1768d1..1d023e0aba3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
@@ -700,9 +700,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -772,9 +772,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -892,9 +892,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1036,9 +1036,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1108,9 +1108,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1192,9 +1192,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1408,9 +1408,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1480,9 +1480,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1552,9 +1552,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1708,9 +1708,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2068,9 +2068,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2224,9 +2224,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2452,9 +2452,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2524,9 +2524,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2644,9 +2644,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2836,9 +2836,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2920,9 +2920,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2992,9 +2992,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3148,9 +3148,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3220,9 +3220,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3292,9 +3292,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3448,9 +3448,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3520,9 +3520,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3592,9 +3592,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3676,9 +3676,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3916,9 +3916,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3988,9 +3988,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4120,9 +4120,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4288,9 +4288,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4468,9 +4468,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4636,9 +4636,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4708,9 +4708,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4840,9 +4840,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4924,9 +4924,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5080,9 +5080,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5284,9 +5284,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5368,9 +5368,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5440,9 +5440,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5524,9 +5524,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5608,9 +5608,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5680,9 +5680,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5764,9 +5764,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5836,9 +5836,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5956,9 +5956,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6040,9 +6040,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6184,9 +6184,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6256,9 +6256,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6448,9 +6448,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6532,9 +6532,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6688,9 +6688,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6844,9 +6844,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6976,9 +6976,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7048,9 +7048,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7288,9 +7288,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7372,9 +7372,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7516,9 +7516,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7744,9 +7744,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7888,9 +7888,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7972,9 +7972,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8044,9 +8044,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8116,9 +8116,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8284,9 +8284,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8428,9 +8428,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8632,9 +8632,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8716,9 +8716,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8800,9 +8800,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9016,9 +9016,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9232,9 +9232,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9388,9 +9388,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9592,9 +9592,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9664,9 +9664,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9748,9 +9748,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9820,9 +9820,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9904,9 +9904,9 @@
"t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
index e73ac0561eb..64eaa2eef81 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
@@ -40,9 +40,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -52,9 +52,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -856,9 +856,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -868,9 +868,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1048,9 +1048,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1060,9 +1060,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1612,9 +1612,9 @@
"t": "text.html.handlebars meta.tag.block.any.html meta.attribute-with-value.id.html entity.other.attribute-name.id.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1840,9 +1840,9 @@
"t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1852,9 +1852,9 @@
"t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2303,4 +2303,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
index 428e98c1118..99d47827659 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
@@ -124,9 +124,9 @@
"t": "text.html.handlebars meta.tag.block.any.html meta.attribute-with-value.id.html entity.other.attribute-name.id.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -352,9 +352,9 @@
"t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -364,9 +364,9 @@
"t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1072,9 +1072,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1084,9 +1084,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1528,9 +1528,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1540,9 +1540,9 @@
"t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1662,7 +1662,7 @@
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "variable: #9CDCFE",
"hc_light": "variable: #001080"
}
@@ -1672,9 +1672,9 @@
"t": "text.html.handlebars meta.function.inline.other.handlebars entity.other.attribute-name.handlebars",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1974,7 +1974,7 @@
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "variable: #9CDCFE",
"hc_light": "variable: #001080"
}
@@ -1984,9 +1984,9 @@
"t": "text.html.handlebars meta.function.inline.other.handlebars entity.other.attribute-name.handlebars",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2135,4 +2135,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
index a622ecb8611..2070e202ee8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
@@ -124,9 +124,9 @@
"t": "text.html.derivative meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -340,9 +340,9 @@
"t": "text.html.derivative meta.tag.metadata.link.void.html meta.attribute.href.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -412,9 +412,9 @@
"t": "text.html.derivative meta.tag.metadata.link.void.html meta.attribute.rel.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -544,9 +544,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -676,9 +676,9 @@
"t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -748,9 +748,9 @@
"t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1024,9 +1024,9 @@
"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.id.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1240,9 +1240,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1408,9 +1408,9 @@
"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2512,9 +2512,9 @@
"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2632,9 +2632,9 @@
"t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2764,9 +2764,9 @@
"t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2884,9 +2884,9 @@
"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3088,9 +3088,9 @@
"t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -3208,9 +3208,9 @@
"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
index bc89c8dd8b4..1b2f32d6270 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
@@ -1948,9 +1948,9 @@
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2008,9 +2008,9 @@
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2380,9 +2380,9 @@
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2452,9 +2452,9 @@
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -2615,4 +2615,4 @@
"hc_light": "default: #292929"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
index 6ac176bdbbd..f26403edc50 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -340,9 +340,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -352,9 +352,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -436,9 +436,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -448,9 +448,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -484,9 +484,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -496,9 +496,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -592,9 +592,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -604,9 +604,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -664,9 +664,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -700,9 +700,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -712,9 +712,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -736,9 +736,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -748,9 +748,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -808,9 +808,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -820,9 +820,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -856,9 +856,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -868,9 +868,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1012,9 +1012,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1024,9 +1024,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1108,9 +1108,9 @@
"t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1120,9 +1120,9 @@
"t": "source.css.less meta.property-list.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1408,9 +1408,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1468,9 +1468,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1480,9 +1480,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1576,9 +1576,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1636,9 +1636,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -1648,9 +1648,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2116,9 +2116,9 @@
"t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2200,9 +2200,9 @@
"t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2344,9 +2344,9 @@
"t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2476,9 +2476,9 @@
"t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2620,9 +2620,9 @@
"t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2764,9 +2764,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2776,9 +2776,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2848,9 +2848,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2860,9 +2860,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2920,9 +2920,9 @@
"t": "source.css.less variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -2932,9 +2932,9 @@
"t": "source.css.less variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3052,9 +3052,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3100,9 +3100,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3112,9 +3112,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3208,9 +3208,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3244,9 +3244,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3256,9 +3256,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3292,9 +3292,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3340,9 +3340,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3352,9 +3352,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3508,9 +3508,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3556,9 +3556,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3568,9 +3568,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3664,9 +3664,9 @@
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3724,9 +3724,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
@@ -3736,9 +3736,9 @@
"t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less",
"r": {
"dark_plus": "variable.other.less: #9CDCFE",
- "light_plus": "variable.other.less: #FF0000",
+ "light_plus": "variable.other.less: #E50000",
"dark_vs": "variable.other.less: #9CDCFE",
- "light_vs": "variable.other.less: #FF0000",
+ "light_vs": "variable.other.less: #E50000",
"hc_black": "variable.other.less: #D4D4D4",
"hc_light": "variable.other.less: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
index 66549f6d2d4..78de60b2f92 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
@@ -424,9 +424,9 @@
"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -496,9 +496,9 @@
"t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -724,9 +724,9 @@
"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -916,9 +916,9 @@
"t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html entity.other.attribute-name.html",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1156,9 +1156,9 @@
"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
index ef09f64c9fd..e0e47e6d326 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
@@ -112,9 +112,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -436,9 +436,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -964,9 +964,9 @@
"t": "text.pug entity.other.attribute-name.class.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1132,9 +1132,9 @@
"t": "text.pug entity.other.attribute-name.class.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1180,9 +1180,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1228,9 +1228,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1276,9 +1276,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1360,9 +1360,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1408,9 +1408,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1492,9 +1492,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1540,9 +1540,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1624,9 +1624,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1672,9 +1672,9 @@
"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1859,4 +1859,4 @@
"hc_light": "default: #292929"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
index 4e86712fa61..3d5c91da983 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
@@ -280,9 +280,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -436,9 +436,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -568,9 +568,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -736,9 +736,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -940,9 +940,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1060,9 +1060,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1204,9 +1204,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1540,9 +1540,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1588,9 +1588,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -1672,9 +1672,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2776,9 +2776,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -2980,9 +2980,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3100,9 +3100,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3172,9 +3172,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3340,9 +3340,9 @@
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3424,9 +3424,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -3460,9 +3460,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3496,9 +3496,9 @@
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3580,9 +3580,9 @@
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3712,9 +3712,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3760,9 +3760,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3808,9 +3808,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3856,9 +3856,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -3952,9 +3952,9 @@
"t": "source.css.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -4024,9 +4024,9 @@
"t": "source.css.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -4180,9 +4180,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -4504,9 +4504,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4720,9 +4720,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4864,9 +4864,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -4996,9 +4996,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5356,9 +5356,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5560,9 +5560,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -5620,9 +5620,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -5692,9 +5692,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -5776,9 +5776,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -5908,9 +5908,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -5980,9 +5980,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6112,9 +6112,9 @@
"t": "source.css.scss meta.at-rule.function.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6208,9 +6208,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6256,9 +6256,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6316,9 +6316,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6424,9 +6424,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -6520,9 +6520,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -6760,9 +6760,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -7024,9 +7024,9 @@
"t": "source.css.scss meta.at-rule.import.scss string.quoted.double.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -7336,9 +7336,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7516,9 +7516,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.media.scss meta.property-list.media-query.scss meta.property-name.media-query.scss support.type.property-name.media.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7612,9 +7612,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7816,9 +7816,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -7936,9 +7936,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8164,9 +8164,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8284,9 +8284,9 @@
"t": "source.css.scss entity.other.attribute-name.placeholder.css punctuation.definition.entity.css",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -8296,9 +8296,9 @@
"t": "source.css.scss entity.other.attribute-name.placeholder.css",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -8344,9 +8344,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8416,9 +8416,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8488,9 +8488,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -8668,9 +8668,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.placeholder.css punctuation.definition.entity.css",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -8680,9 +8680,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.placeholder.css",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -8884,9 +8884,9 @@
"t": "source.css.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -8908,9 +8908,9 @@
"t": "source.css.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9028,9 +9028,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9160,9 +9160,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9232,9 +9232,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9328,9 +9328,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9448,9 +9448,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9580,9 +9580,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9652,9 +9652,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9748,9 +9748,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9808,9 +9808,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9880,9 +9880,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9916,9 +9916,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -9952,9 +9952,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -9988,9 +9988,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -10324,9 +10324,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -10588,9 +10588,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -10780,9 +10780,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -10948,9 +10948,9 @@
"t": "source.css.scss meta.definition.variable.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -11080,9 +11080,9 @@
"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -11152,9 +11152,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -11296,9 +11296,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -11464,9 +11464,9 @@
"t": "source.css.scss meta.at-rule.for.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -11644,9 +11644,9 @@
"t": "source.css.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -11704,9 +11704,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -11800,9 +11800,9 @@
"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -11932,9 +11932,9 @@
"t": "source.css.scss meta.at-rule.each.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12052,9 +12052,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12124,9 +12124,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -12220,9 +12220,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss string.quoted.single.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12364,9 +12364,9 @@
"t": "source.css.scss meta.at-rule.each.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12448,9 +12448,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12580,9 +12580,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12640,9 +12640,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -12736,9 +12736,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12796,9 +12796,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -12832,9 +12832,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13012,9 +13012,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13048,9 +13048,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13144,9 +13144,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13240,9 +13240,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13360,9 +13360,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13492,9 +13492,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13528,9 +13528,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13636,9 +13636,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -13900,9 +13900,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.return.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -14104,9 +14104,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14176,9 +14176,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14260,9 +14260,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14356,9 +14356,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14572,9 +14572,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14752,9 +14752,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -14776,9 +14776,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -14884,9 +14884,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14932,9 +14932,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -14968,9 +14968,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -15004,9 +15004,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -15040,9 +15040,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -15436,9 +15436,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -15508,9 +15508,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css",
"r": {
"dark_plus": "support.type.vendored.property-name: #9CDCFE",
- "light_plus": "support.type.vendored.property-name: #FF0000",
+ "light_plus": "support.type.vendored.property-name: #E50000",
"dark_vs": "support.type.vendored.property-name: #9CDCFE",
- "light_vs": "support.type.vendored.property-name: #FF0000",
+ "light_vs": "support.type.vendored.property-name: #E50000",
"hc_black": "support.type.vendored.property-name: #D4D4D4",
"hc_light": "support.type.vendored.property-name: #264F78"
}
@@ -15544,9 +15544,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -15580,9 +15580,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css",
"r": {
"dark_plus": "support.type.vendored.property-name: #9CDCFE",
- "light_plus": "support.type.vendored.property-name: #FF0000",
+ "light_plus": "support.type.vendored.property-name: #E50000",
"dark_vs": "support.type.vendored.property-name: #9CDCFE",
- "light_vs": "support.type.vendored.property-name: #FF0000",
+ "light_vs": "support.type.vendored.property-name: #E50000",
"hc_black": "support.type.vendored.property-name: #D4D4D4",
"hc_light": "support.type.vendored.property-name: #264F78"
}
@@ -15616,9 +15616,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -15652,9 +15652,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -15688,9 +15688,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16252,9 +16252,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16276,9 +16276,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16300,9 +16300,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16360,9 +16360,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -16396,9 +16396,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16432,9 +16432,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -16468,9 +16468,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16504,9 +16504,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -16540,9 +16540,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16576,9 +16576,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -16828,9 +16828,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -17284,9 +17284,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -17464,9 +17464,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.if.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -17668,9 +17668,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.attribute-selector.scss entity.other.attribute-name.attribute.scss",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -18016,9 +18016,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -18100,9 +18100,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -18364,9 +18364,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -19036,9 +19036,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -19084,9 +19084,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -19144,9 +19144,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -19324,9 +19324,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -19468,9 +19468,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -19564,9 +19564,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20152,9 +20152,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -20224,9 +20224,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -20440,9 +20440,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20524,9 +20524,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20644,9 +20644,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20740,9 +20740,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20788,9 +20788,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -20896,9 +20896,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -21136,9 +21136,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -21280,9 +21280,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -21484,9 +21484,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -21628,9 +21628,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -21736,9 +21736,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css",
"r": {
"dark_plus": "support.type.vendored.property-name: #9CDCFE",
- "light_plus": "support.type.vendored.property-name: #FF0000",
+ "light_plus": "support.type.vendored.property-name: #E50000",
"dark_vs": "support.type.vendored.property-name: #9CDCFE",
- "light_vs": "support.type.vendored.property-name: #FF0000",
+ "light_vs": "support.type.vendored.property-name: #E50000",
"hc_black": "support.type.vendored.property-name: #D4D4D4",
"hc_light": "support.type.vendored.property-name: #264F78"
}
@@ -21832,9 +21832,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -21952,9 +21952,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -22180,9 +22180,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -22324,9 +22324,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "support.type.property-name: #9CDCFE",
- "light_plus": "support.type.property-name: #FF0000",
+ "light_plus": "support.type.property-name: #E50000",
"dark_vs": "support.type.property-name: #9CDCFE",
- "light_vs": "support.type.property-name: #FF0000",
+ "light_vs": "support.type.property-name: #E50000",
"hc_black": "support.type.property-name: #D4D4D4",
"hc_light": "support.type.property-name: #264F78"
}
@@ -22468,9 +22468,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.attribute-selector.scss entity.other.attribute-name.attribute.scss",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -22720,9 +22720,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
@@ -22804,9 +22804,9 @@
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
- "light_plus": "variable.scss: #FF0000",
+ "light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
- "light_vs": "variable.scss: #FF0000",
+ "light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"hc_light": "variable.scss: #264F78"
}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
index 4b149ad534e..64b2f7bc6e8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
@@ -88,9 +88,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -208,9 +208,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -328,9 +328,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -400,9 +400,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -568,9 +568,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -640,9 +640,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -952,9 +952,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1552,9 +1552,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1624,9 +1624,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1744,9 +1744,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1816,9 +1816,9 @@
"t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
- "light_plus": "entity.other.attribute-name: #FF0000",
+ "light_plus": "entity.other.attribute-name: #E50000",
"dark_vs": "entity.other.attribute-name: #9CDCFE",
- "light_vs": "entity.other.attribute-name: #FF0000",
+ "light_vs": "entity.other.attribute-name: #E50000",
"hc_black": "entity.other.attribute-name: #9CDCFE",
"hc_light": "entity.other.attribute-name: #264F78"
}
@@ -1967,4 +1967,4 @@
"hc_light": "punctuation.definition.tag: #0F4A85"
}
}
-]
\ No newline at end of file
+]
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index da90e7e3809..167275aa275 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"enableProposedApi": true,
"enabledApiProposals": [
- "resolvers"
+ "resolvers",
+ "tunnels"
],
"private": true,
"engines": {
diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json
index f9a183ef9e1..4a8025df9b5 100644
--- a/extensions/vscode-test-resolver/tsconfig.json
+++ b/extensions/vscode-test-resolver/tsconfig.json
@@ -9,6 +9,7 @@
"include": [
"src/**/*",
"../../src/vscode-dts/vscode.d.ts",
+ "../../src/vscode-dts/vscode.proposed.tunnels.d.ts",
"../../src/vscode-dts/vscode.proposed.resolvers.d.ts"
]
}
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 919cf0aa6a8..619417cb66c 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -42,10 +42,10 @@ node-gyp-build@^4.3.0:
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
-typescript@4.8.3:
- version "4.8.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
- integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
+typescript@4.8.4:
+ version "4.8.4"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+ integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
vscode-grammar-updater@^1.1.0:
version "1.1.0"
diff --git a/package.json b/package.json
index 9957d764a7f..6a5bbde783b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
- "version": "1.72.0",
- "distro": "d9fc5ec0abd44d6d2eab4ad5c0cf4ca9c4e839e1",
+ "version": "1.73.0",
+ "distro": "cac14b226f101a8186316eb3dc74f1de73c0a5be",
"author": {
"name": "Microsoft Corporation"
},
@@ -86,13 +86,13 @@
"vscode-proxy-agent": "^0.12.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "7.0.1",
- "xterm": "5.1.0-beta.1",
- "xterm-addon-canvas": "0.3.0-beta.1",
- "xterm-addon-search": "0.11.0-beta.1",
- "xterm-addon-serialize": "0.9.0-beta.1",
+ "xterm": "5.1.0-beta.29",
+ "xterm-addon-canvas": "0.3.0-beta.13",
+ "xterm-addon-search": "0.11.0-beta.4",
+ "xterm-addon-serialize": "0.9.0-beta.2",
"xterm-addon-unicode11": "0.5.0-beta.1",
- "xterm-addon-webgl": "0.14.0-beta.2",
- "xterm-headless": "5.1.0-beta.1",
+ "xterm-addon-webgl": "0.14.0-beta.20",
+ "xterm-headless": "5.1.0-beta.29",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
},
@@ -125,9 +125,10 @@
"@types/winreg": "^1.2.30",
"@types/yauzl": "^2.9.1",
"@types/yazl": "^2.4.2",
- "@typescript-eslint/eslint-plugin": "^5.10.0",
- "@typescript-eslint/experimental-utils": "^5.10.0",
- "@typescript-eslint/parser": "^5.10.0",
+ "@typescript-eslint/eslint-plugin": "^5.39.0",
+ "@typescript-eslint/experimental-utils": "^5.39.0",
+ "@typescript-eslint/parser": "^5.39.0",
+ "@vscode/l10n-dev": "0.0.15",
"@vscode/telemetry-extractor": "^1.9.8",
"@vscode/test-web": "^0.0.29",
"ansi-colors": "^3.2.3",
@@ -206,7 +207,7 @@
"ts-loader": "^9.2.7",
"ts-node": "^10.9.1",
"tsec": "0.1.4",
- "typescript": "^4.9.0-dev.20220921",
+ "typescript": "^4.9.0-dev.20221011",
"typescript-formatter": "7.1.0",
"underscore": "^1.12.1",
"util": "^0.12.4",
diff --git a/product.json b/product.json
index d97f6cc80b5..c76943372f1 100644
--- a/product.json
+++ b/product.json
@@ -11,6 +11,7 @@
"serverLicensePrompt": "",
"serverApplicationName": "code-server-oss",
"serverDataFolderName": ".vscode-server-oss",
+ "tunnelApplicationName": "code-tunnel-oss",
"win32DirName": "Microsoft Code OSS",
"win32NameVersion": "Microsoft Code OSS",
"win32RegValueName": "CodeOSS",
@@ -46,7 +47,7 @@
},
{
"name": "ms-vscode.js-debug",
- "version": "1.71.1",
+ "version": "1.72.0",
"repo": "https://github.com/microsoft/vscode-js-debug",
"metadata": {
"id": "25629058-ddac-4e17-abba-74678e126c5d",
diff --git a/remote/package.json b/remote/package.json
index c6d2d2547ad..a08e298af45 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -24,13 +24,13 @@
"vscode-proxy-agent": "^0.12.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "7.0.1",
- "xterm": "5.1.0-beta.1",
- "xterm-addon-canvas": "0.3.0-beta.1",
- "xterm-addon-search": "0.11.0-beta.1",
- "xterm-addon-serialize": "0.9.0-beta.1",
+ "xterm": "5.1.0-beta.29",
+ "xterm-addon-canvas": "0.3.0-beta.13",
+ "xterm-addon-search": "0.11.0-beta.4",
+ "xterm-addon-serialize": "0.9.0-beta.2",
"xterm-addon-unicode11": "0.5.0-beta.1",
- "xterm-addon-webgl": "0.14.0-beta.2",
- "xterm-headless": "5.1.0-beta.1",
+ "xterm-addon-webgl": "0.14.0-beta.20",
+ "xterm-headless": "5.1.0-beta.29",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
},
diff --git a/remote/web/package.json b/remote/web/package.json
index d7e6c49c66f..962f1cc0dc3 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,10 +11,10 @@
"tas-client-umd": "0.1.6",
"vscode-oniguruma": "1.6.1",
"vscode-textmate": "7.0.1",
- "xterm": "5.1.0-beta.1",
- "xterm-addon-canvas": "0.3.0-beta.1",
- "xterm-addon-search": "0.11.0-beta.1",
+ "xterm": "5.1.0-beta.29",
+ "xterm-addon-canvas": "0.3.0-beta.13",
+ "xterm-addon-search": "0.11.0-beta.4",
"xterm-addon-unicode11": "0.5.0-beta.1",
- "xterm-addon-webgl": "0.14.0-beta.2"
+ "xterm-addon-webgl": "0.14.0-beta.20"
}
}
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index c9a0cd1bacf..679924f51d6 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -68,27 +68,27 @@ vscode-textmate@7.0.1:
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79"
integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==
-xterm-addon-canvas@0.3.0-beta.1:
- version "0.3.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.1.tgz#17a65f5da65416b01d620ddef6247ff5013ffc15"
- integrity sha512-34PKhrkvK1RtlOOmni4i5GUIyoFKGMph8fWFvA2d52IDTKmX9YoLzZfU73D/sUAx+/GKobCE8sr14CuBZctgNw==
+xterm-addon-canvas@0.3.0-beta.13:
+ version "0.3.0-beta.13"
+ resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.13.tgz#6fd23f4c8d4d013a540cb8ff1e4965ff6bf248b5"
+ integrity sha512-gNl2wG5zv5AttbTs1OgMRFcARs/dt0k2snFpMmrnaTKlgpi3S0k+Sh3C4nbdMuqbCZd+n7gtpAYP+F6ZXC1pdA==
-xterm-addon-search@0.11.0-beta.1:
- version "0.11.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.1.tgz#fe7178d70246cde73550447c5524672575467499"
- integrity sha512-fKj8KnnhH1nC4oZpKsgnhtgxkTctoa9kGLMpTJjsNzFu0VvXvLGIRezTPI75UEIQdEdaxcwB7/aKelQTO+72LA==
+xterm-addon-search@0.11.0-beta.4:
+ version "0.11.0-beta.4"
+ resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.4.tgz#35c01a98b092adbbd1828b0d2eea28485a9a1538"
+ integrity sha512-rtDBg9CWDw6c0tMeBmaKan2UWwSY88UkfkLv+g50EopDyx6J337nxgjKGioUjF0pZ1VwFOaP1+rFRk8XwLiUHA==
xterm-addon-unicode11@0.5.0-beta.1:
version "0.5.0-beta.1"
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2"
integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A==
-xterm-addon-webgl@0.14.0-beta.2:
- version "0.14.0-beta.2"
- resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.2.tgz#832c31b52b78fb67a65bbd23c9fb850caceb43ae"
- integrity sha512-1ccbkJiUZ5ojnoAEJsbdV0jMZaYSnZ02wfV8yBU243u6TTgvCzZ7nq5BR9bT+5K/ESFWiekobfybxHwuYnylmQ==
+xterm-addon-webgl@0.14.0-beta.20:
+ version "0.14.0-beta.20"
+ resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.20.tgz#1bd723a58ab6414c4773d181bbae51751827768c"
+ integrity sha512-inUnGzw+ewMszMQY8PqO97/t6hh/qg712uyuHLLoinDOjzXN5x2IiPMrt4LL70P6YmmTU65m/Gmfp+rd2u4yWg==
-xterm@5.1.0-beta.1:
- version "5.1.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.1.tgz#a6617c6887066d166632d1e69b6eb83a179d8b63"
- integrity sha512-ml7bqjO23bh4yu7qXKogXtCy4SbDTV21rfDXUvLPPaxrlQus6NoN1byy1eFH4ONWpv5ZHGeItRdQ/X00et9Pcw==
+xterm@5.1.0-beta.29:
+ version "5.1.0-beta.29"
+ resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.29.tgz#76368661b0503800c3f4374ab380e806290038e6"
+ integrity sha512-qirPDkX99thKjd7bkZMBQfP6EMOWTigYQz9lFU5tIkqsoYCu7zakaakkQuC2xbVRue9nftHZItzYKeO1/ldvTA==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 7b384ed44b9..056cc5a71f6 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -788,40 +788,40 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-xterm-addon-canvas@0.3.0-beta.1:
- version "0.3.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.1.tgz#17a65f5da65416b01d620ddef6247ff5013ffc15"
- integrity sha512-34PKhrkvK1RtlOOmni4i5GUIyoFKGMph8fWFvA2d52IDTKmX9YoLzZfU73D/sUAx+/GKobCE8sr14CuBZctgNw==
+xterm-addon-canvas@0.3.0-beta.13:
+ version "0.3.0-beta.13"
+ resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.13.tgz#6fd23f4c8d4d013a540cb8ff1e4965ff6bf248b5"
+ integrity sha512-gNl2wG5zv5AttbTs1OgMRFcARs/dt0k2snFpMmrnaTKlgpi3S0k+Sh3C4nbdMuqbCZd+n7gtpAYP+F6ZXC1pdA==
-xterm-addon-search@0.11.0-beta.1:
- version "0.11.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.1.tgz#fe7178d70246cde73550447c5524672575467499"
- integrity sha512-fKj8KnnhH1nC4oZpKsgnhtgxkTctoa9kGLMpTJjsNzFu0VvXvLGIRezTPI75UEIQdEdaxcwB7/aKelQTO+72LA==
+xterm-addon-search@0.11.0-beta.4:
+ version "0.11.0-beta.4"
+ resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.4.tgz#35c01a98b092adbbd1828b0d2eea28485a9a1538"
+ integrity sha512-rtDBg9CWDw6c0tMeBmaKan2UWwSY88UkfkLv+g50EopDyx6J337nxgjKGioUjF0pZ1VwFOaP1+rFRk8XwLiUHA==
-xterm-addon-serialize@0.9.0-beta.1:
- version "0.9.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.1.tgz#44a8047ec85abe4db232acc58c53355dd314bf6d"
- integrity sha512-jVkpU5GC728ko0k190o+M1xubMkhRolKj18160rxlZhd0Sm/1yHUtFneC9pYSsLypynd3Te5LnZnHfEgVmka4g==
+xterm-addon-serialize@0.9.0-beta.2:
+ version "0.9.0-beta.2"
+ resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.2.tgz#2f37ba57cabcdbf6dfe56bce8209de04dcfaa8ef"
+ integrity sha512-oCRHXdlrlzcNmxRxHJlYq6FiJlgQDXft62DcE+WY7Y7R5rjPB8ahrSQHBwjc3ZIK0GRL8fRReuwxL1+Jy4Dt4Q==
xterm-addon-unicode11@0.5.0-beta.1:
version "0.5.0-beta.1"
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2"
integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A==
-xterm-addon-webgl@0.14.0-beta.2:
- version "0.14.0-beta.2"
- resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.2.tgz#832c31b52b78fb67a65bbd23c9fb850caceb43ae"
- integrity sha512-1ccbkJiUZ5ojnoAEJsbdV0jMZaYSnZ02wfV8yBU243u6TTgvCzZ7nq5BR9bT+5K/ESFWiekobfybxHwuYnylmQ==
+xterm-addon-webgl@0.14.0-beta.20:
+ version "0.14.0-beta.20"
+ resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.20.tgz#1bd723a58ab6414c4773d181bbae51751827768c"
+ integrity sha512-inUnGzw+ewMszMQY8PqO97/t6hh/qg712uyuHLLoinDOjzXN5x2IiPMrt4LL70P6YmmTU65m/Gmfp+rd2u4yWg==
-xterm-headless@5.1.0-beta.1:
- version "5.1.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.1.tgz#badec2e97e47aa44267a4de2c1b42b4d23ad49a2"
- integrity sha512-V3G7l4pN6/HW//vKXryOCdDXVKdrQTQmtHEqkZ8waD68cJdeMdIoGYJuzavd5rHpxCqm/KR5O8ztI41jridong==
+xterm-headless@5.1.0-beta.29:
+ version "5.1.0-beta.29"
+ resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.29.tgz#b3c2bbd934fe5d9111b2206ddaf039d604aefe95"
+ integrity sha512-hzIzZwYtubZplfnmtx1IQdipp2eTt09zjTT6/JZFSTcTLBUCtePlgtCZPJENUyy5v+aSJgbMTDFrfjARRBCZMw==
-xterm@5.1.0-beta.1:
- version "5.1.0-beta.1"
- resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.1.tgz#a6617c6887066d166632d1e69b6eb83a179d8b63"
- integrity sha512-ml7bqjO23bh4yu7qXKogXtCy4SbDTV21rfDXUvLPPaxrlQus6NoN1byy1eFH4ONWpv5ZHGeItRdQ/X00et9Pcw==
+xterm@5.1.0-beta.29:
+ version "5.1.0-beta.29"
+ resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.29.tgz#76368661b0503800c3f4374ab380e806290038e6"
+ integrity sha512-qirPDkX99thKjd7bkZMBQfP6EMOWTigYQz9lFU5tIkqsoYCu7zakaakkQuC2xbVRue9nftHZItzYKeO1/ldvTA==
yallist@^4.0.0:
version "4.0.0"
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index feabb6dc4e8..e5b356f3dec 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -9,40 +9,21 @@ set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
:: Figure out which Electron to use for running tests
if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
- :: Run out of sources: no need to compile as code.bat takes care of it
chcp 65001
set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
- echo Storing crash reports into '%VSCODECRASHDIR%'.
- echo Storing log files into '%VSCODELOGSDIR%'.
echo Running integration tests out of sources.
) else (
- :: Run from a built: need to compile all test extensions
- :: because we run extension tests from their source folders
- :: and the build bundles extensions into .build webpacked
- :: call yarn gulp compile-extension:vscode-api-tests^
- :: compile-extension:vscode-colorize-tests^
- :: compile-extension:markdown-language-features^
- :: compile-extension:typescript-language-features^
- :: compile-extension:emmet^
- :: compile-extension:css-language-features-server^
- :: compile-extension:html-language-features-server^
- :: compile-extension:json-language-features-server^
- :: compile-extension:git^
- :: compile-extension:ipynb^
- :: compile-extension:configuration-editing^
- :: compile-extension-media
-
- :: Configuration for more verbose output
set VSCODE_CLI=1
set ELECTRON_ENABLE_LOGGING=1
- echo Storing crash reports into '%VSCODECRASHDIR%'.
- echo Storing log files into '%VSCODELOGSDIR%'.
echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
)
+echo Storing crash reports into '%VSCODECRASHDIR%'.
+echo Storing log files into '%VSCODELOGSDIR%'.
+
:: Tests standalone (AMD)
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 4e82d1453d7..e43ef46016c 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -20,38 +20,19 @@ cd $ROOT
# Figure out which Electron to use for running tests
if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ]
then
- # Run out of sources: no need to compile as code.sh takes care of it
INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh"
- echo "Storing crash reports into '$VSCODECRASHDIR'."
- echo "Storing log files into '$VSCODELOGSDIR'."
echo "Running integration tests out of sources."
else
- # Run from a built: need to compile all test extensions
- # because we run extension tests from their source folders
- # and the build bundles extensions into .build webpacked
- # yarn gulp compile-extension:vscode-api-tests \
- # compile-extension:vscode-colorize-tests \
- # compile-extension:markdown-language-features \
- # compile-extension:typescript-language-features \
- # compile-extension:emmet \
- # compile-extension:css-language-features-server \
- # compile-extension:html-language-features-server \
- # compile-extension:json-language-features-server \
- # compile-extension:git \
- # compile-extension:ipynb \
- # compile-extension:configuration-editing \
- # compile-extension-media
-
- # Configuration for more verbose output
export VSCODE_CLI=1
export ELECTRON_ENABLE_LOGGING=1
- echo "Storing crash reports into '$VSCODECRASHDIR'."
- echo "Storing log files into '$VSCODELOGSDIR'."
echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build."
fi
+echo "Storing crash reports into '$VSCODECRASHDIR'."
+echo "Storing log files into '$VSCODELOGSDIR'."
+
# Tests standalone (AMD)
diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat
index a7d0719205f..e0fda5d1c4e 100644
--- a/scripts/test-remote-integration.bat
+++ b/scripts/test-remote-integration.bat
@@ -19,7 +19,7 @@ IF "%VSCODEUSERDATADIR%" == "" (
set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5%
)
-set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH%
+set REMOTE_EXT_PATH=%AUTHORITY%%EXT_PATH%
set VSCODECRASHDIR=%~dp0\..\.build\crashes
set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests-remote
set TESTRESOLVER_DATA_FOLDER=%TMP%\testresolverdatafolder-%RANDOM%-%TIME:~6,5%
@@ -32,45 +32,80 @@ if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
echo Using '%VSCODE_REMOTE_SERVER_PATH%' as server path
)
-set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
-
:: Figure out which Electron to use for running tests
if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
- echo Storing crash reports into '%VSCODECRASHDIR%'
- echo Storing log files into '%VSCODELOGSDIR%'
+ chcp 65001
+ set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
+ set API_TESTS_EXTRA_ARGS_BUILT=
- :: Tests in the extension host running from sources
- call .\scripts\code.bat --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS%
- if %errorlevel% neq 0 exit /b %errorlevel%
-
- call .\scripts\code.bat --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS%
- if %errorlevel% neq 0 exit /b %errorlevel%
+ echo Running integration tests out of sources.
) else (
- echo Storing crash reports into '%VSCODECRASHDIR%'
- echo Storing log files into '%VSCODELOGSDIR%'
- echo Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path
-
- :: Run from a built: need to compile all test extensions
- :: because we run extension tests from their source folders
- :: and the build bundles extensions into .build webpacked
- :: call yarn gulp compile-extension:vscode-api-tests^
- :: compile-extension:microsoft-authentication^
- :: compile-extension:github-authentication^
- :: compile-extension:vscode-test-resolver
-
- :: Configuration for more verbose output
set VSCODE_CLI=1
set ELECTRON_ENABLE_LOGGING=1
- set ELECTRON_ENABLE_STACK_DUMPING=1
- :: Tests in the extension host running from built version (both client and server)
- call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests
- if %errorlevel% neq 0 exit /b %errorlevel%
+ :: Extra arguments only when running against a built version
+ set API_TESTS_EXTRA_ARGS_BUILT=--extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests
- call "%INTEGRATION_TEST_ELECTRON_PATH%" --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests
- if %errorlevel% neq 0 exit /b %errorlevel%
+ echo Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path
)
+echo Storing crash reports into '%VSCODECRASHDIR%'
+echo Storing log files into '%VSCODELOGSDIR%'
+
+
+:: Tests in the extension host
+
+set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
+
+echo.
+echo ### API tests (folder)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/vscode-api-tests --extensionTestsPath=%REMOTE_EXT_PATH%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### API tests (workspace)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --file-uri=%REMOTE_EXT_PATH%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/vscode-api-tests --extensionTestsPath=%REMOTE_EXT_PATH%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### TypeScript tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/typescript-language-features/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/typescript-language-features --extensionTestsPath=%REMOTE_EXT_PATH%/typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Markdown tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/markdown-language-features/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/markdown-language-features --extensionTestsPath=%REMOTE_EXT_PATH%/markdown-language-features/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Emmet tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/emmet/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/emmet --extensionTestsPath=%REMOTE_EXT_PATH%/emmet/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Git tests
+for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
+set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%%GITWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/git --extensionTestsPath=%REMOTE_EXT_PATH%/git/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Ipynb tests
+set IPYNBWORKSPACE=%TEMPDIR%\ipynb-%RANDOM%
+mkdir %IPYNBWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%%IPYNBWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/ipynb --extensionTestsPath=%REMOTE_EXT_PATH%/ipynb/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Configuration editing tests
+set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
+mkdir %CFWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%/%CFWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/configuration-editing --extensionTestsPath=%REMOTE_EXT_PATH%/configuration-editing/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:: Cleanup
+
IF "%3" == "" (
rmdir /s /q %VSCODEUSERDATADIR%
)
diff --git a/scripts/test-remote-integration.sh b/scripts/test-remote-integration.sh
index 6d883f53217..8163e796645 100755
--- a/scripts/test-remote-integration.sh
+++ b/scripts/test-remote-integration.sh
@@ -34,40 +34,19 @@ export REMOTE_VSCODE=$AUTHORITY$EXT_PATH
# Figure out which Electron to use for running tests
if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ]
then
- # Run out of sources: no need to compile as code.sh takes care of it
INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh"
# No extra arguments when running out of sources
EXTRA_INTEGRATION_TEST_ARGUMENTS=""
- echo "Storing crash reports into '$VSCODECRASHDIR'."
- echo "Storing log files into '$VSCODELOGSDIR'."
echo "Running remote integration tests out of sources."
else
- # Run from a built: need to compile all test extensions
- # because we run extension tests from their source folders
- # and the build bundles extensions into .build webpacked
- # yarn gulp compile-extension:vscode-api-tests \
- # compile-extension:vscode-test-resolver \
- # compile-extension:markdown-language-features \
- # compile-extension:typescript-language-features \
- # compile-extension:emmet \
- # compile-extension:git \
- # compile-extension:ipynb \
- # compile-extension:configuration-editing \
- # compile-extension:microsoft-authentication \
- # compile-extension:github-authentication \
- # compile-extension-media
-
- # Configuration for more verbose output
export VSCODE_CLI=1
export ELECTRON_ENABLE_LOGGING=1
# Running from a build, we need to enable the vscode-test-resolver extension
EXTRA_INTEGRATION_TEST_ARGUMENTS="--extensions-dir=$EXT_PATH --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests"
- echo "Storing crash reports into '$VSCODECRASHDIR'."
- echo "Storing log files into '$VSCODELOGSDIR'."
echo "Running remote integration tests with $INTEGRATION_TEST_ELECTRON_PATH as build."
fi
@@ -91,6 +70,12 @@ fi
API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-keytar --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR"
+echo "Storing crash reports into '$VSCODECRASHDIR'."
+echo "Storing log files into '$VSCODELOGSDIR'."
+
+
+# Tests in the extension host
+
echo
echo "### API tests (folder)"
echo
diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat
index 7be27c00b31..700dd0a045e 100644
--- a/scripts/test-web-integration.bat
+++ b/scripts/test-web-integration.bat
@@ -18,20 +18,11 @@ IF "%~1" == "" (
set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH%
if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
+ chcp 65001
+
echo Using remote server out of sources for integration web tests
) else (
echo Using '%VSCODE_REMOTE_SERVER_PATH%' as server path for web integration tests
-
- :: Run from a built: need to compile all test extensions
- :: because we run extension tests from their source folders
- :: and the build bundles extensions into .build webpacked
- :: call yarn gulp compile-extension:vscode-api-tests^
- :: compile-extension:markdown-language-features^
- :: compile-extension:typescript-language-features^
- :: compile-extension:emmet^
- :: compile-extension:configuration-editing^
- :: compile-extension:git^
- :: compile-extension-media
)
if not exist ".\test\integration\browser\out\index.js" (
@@ -39,6 +30,9 @@ if not exist ".\test\integration\browser\out\index.js" (
call yarn playwright-install
)
+
+:: Tests in the extension host
+
echo.
echo ### API tests (folder)
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=.\extensions\vscode-api-tests --extensionTestsPath=.\extensions\vscode-api-tests\out\singlefolder-tests %*
@@ -72,9 +66,20 @@ mkdir %GITWORKSPACE%
call node .\test\integration\browser\out\index.js --workspacePath=%GITWORKSPACE% --extensionDevelopmentPath=.\extensions\git --extensionTestsPath=.\extensions\git\out\test %*
if %errorlevel% neq 0 exit /b %errorlevel%
+echo.
+echo ### Ipynb tests
+set IPYNBWORKSPACE=%TEMPDIR%\ipynb-%RANDOM%
+mkdir %IPYNBWORKSPACE%
+call node .\test\integration\browser\out\index.js --workspacePath=%IPYNBWORKSPACE% --extensionDevelopmentPath=.\extensions\ipynb --extensionTestsPath=.\extensions\ipynb\out\test %*
+if %errorlevel% neq 0 exit /b %errorlevel%
+
echo.
echo ### Configuration editing tests
set CFWORKSPACE=%TEMPDIR%\git-%RANDOM%
mkdir %CFWORKSPACE%
call node .\test\integration\browser\out\index.js --workspacePath=%CFWORKSPACE% --extensionDevelopmentPath=.\extensions\configuration-editing --extensionTestsPath=.\extensions\configuration-editing\out\test %*
if %errorlevel% neq 0 exit /b %errorlevel%
+
+popd
+
+endlocal
diff --git a/scripts/test-web-integration.sh b/scripts/test-web-integration.sh
index 95278eec0e3..0648a7f8cd8 100755
--- a/scripts/test-web-integration.sh
+++ b/scripts/test-web-integration.sh
@@ -15,18 +15,6 @@ then
echo "Using remote server out of sources for integration web tests"
else
echo "Using $VSCODE_REMOTE_SERVER_PATH as server path for web integration tests"
-
- # Run from a built: need to compile all test extensions
- # because we run extension tests from their source folders
- # and the build bundles extensions into .build webpacked
- # yarn gulp compile-extension:vscode-api-tests \
- # compile-extension:markdown-language-features \
- # compile-extension:typescript-language-features \
- # compile-extension:emmet \
- # compile-extension:git \
- # compile-extension:ipynb \
- # compile-extension:configuration-editing \
- # compile-extension-media
fi
if [ ! -e 'test/integration/browser/out/index.js' ];then
@@ -34,6 +22,7 @@ if [ ! -e 'test/integration/browser/out/index.js' ];then
yarn playwright-install
fi
+
# Tests in the extension host
echo
diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts
index 9d2a34494be..87103de1a54 100644
--- a/src/vs/base/browser/defaultWorkerFactory.ts
+++ b/src/vs/base/browser/defaultWorkerFactory.ts
@@ -43,11 +43,20 @@ export function getWorkerBootstrapUrl(scriptPath: string, label: string): string
return URL.createObjectURL(blob);
}
- const result = new URL(scriptPath);
- COI.addSearchParam(result.searchParams, true, true);
- result.hash = label;
- return result.href;
+ const start = scriptPath.lastIndexOf('?');
+ const end = scriptPath.lastIndexOf('#', start);
+ const params = start > 0
+ ? new URLSearchParams(scriptPath.substring(start + 1, ~end ? end : undefined))
+ : new URLSearchParams();
+ COI.addSearchParam(params, true, true);
+ const search = params.toString();
+
+ if (!search) {
+ return `${scriptPath}#${label}`;
+ } else {
+ return `${scriptPath}?${params.toString()}#${label}`;
+ }
}
// ESM-comment-end
diff --git a/src/vs/base/browser/globalPointerMoveMonitor.ts b/src/vs/base/browser/globalPointerMoveMonitor.ts
index d5c432114d7..0348db2528f 100644
--- a/src/vs/base/browser/globalPointerMoveMonitor.ts
+++ b/src/vs/base/browser/globalPointerMoveMonitor.ts
@@ -64,7 +64,17 @@ export class GlobalPointerMoveMonitor implements IDisposable {
try {
initialElement.setPointerCapture(pointerId);
this._hooks.add(toDisposable(() => {
- initialElement.releasePointerCapture(pointerId);
+ try {
+ initialElement.releasePointerCapture(pointerId);
+ } catch (err) {
+ // See https://github.com/microsoft/vscode/issues/161731
+ //
+ // `releasePointerCapture` sometimes fails when being invoked with the exception:
+ // DOMException: Failed to execute 'releasePointerCapture' on 'Element':
+ // No active pointer with the given id is found.
+ //
+ // There's no need to do anything in case of failure
+ }
}));
} catch (err) {
// See https://github.com/microsoft/vscode/issues/144584
diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index 0e97d180ef1..02e9bc99513 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -435,9 +435,11 @@ export class SelectActionViewItem extends BaseActionViewItem {
}
private registerListeners(): void {
- this._register(this.selectBox.onDidSelect(e => {
- this.actionRunner.run(this._action, this.getActionContext(e.selected, e.index));
- }));
+ this._register(this.selectBox.onDidSelect(e => this.runAction(e.selected, e.index)));
+ }
+
+ protected runAction(option: string, index: number): void {
+ this.actionRunner.run(this._action, this.getActionContext(option, index));
}
protected getActionContext(option: string, index: number) {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index bf63bee9f9e..a0f509ed0ae 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -10,7 +10,7 @@ import { IHoverDelegate } from 'vs/base/browser/ui/iconLabel/iconHoverDelegate';
import { ActionRunner, IAction, IActionRunner, IRunEvent, Separator } from 'vs/base/common/actions';
import { Emitter } from 'vs/base/common/event';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
import * as types from 'vs/base/common/types';
import 'vs/css!./actionbar';
@@ -62,7 +62,7 @@ export class ActionBar extends Disposable implements IActionRunner {
private readonly options: IActionBarOptions;
private _actionRunner: IActionRunner;
- private _actionRunnerDisposables = this._register(new DisposableStore());
+ private readonly _actionRunnerDisposables = this._register(new DisposableStore());
private _context: unknown;
private readonly _orientation: ActionsOrientation;
private readonly _triggerKeys: {
@@ -72,7 +72,7 @@ export class ActionBar extends Disposable implements IActionRunner {
// View Items
viewItems: IActionViewItem[];
- private viewItemDisposables: Map;
+ private readonly viewItemDisposables = this._register(new DisposableMap());
private previouslyFocusedItem?: number;
protected focusedItem?: number;
private focusTracker: DOM.IFocusTracker;
@@ -121,7 +121,6 @@ export class ActionBar extends Disposable implements IActionRunner {
this._actionRunnerDisposables.add(this._actionRunner.onWillRun(e => this._onWillRun.fire(e)));
this.viewItems = [];
- this.viewItemDisposables = new Map();
this.focusedItem = undefined;
this.domNode = document.createElement('div');
@@ -413,18 +412,15 @@ export class ActionBar extends Disposable implements IActionRunner {
pull(index: number): void {
if (index >= 0 && index < this.viewItems.length) {
this.actionsList.removeChild(this.actionsList.childNodes[index]);
- this.viewItemDisposables.get(this.viewItems[index])?.dispose();
- this.viewItemDisposables.delete(this.viewItems[index]);
+ this.viewItemDisposables.deleteAndDispose(this.viewItems[index]);
dispose(this.viewItems.splice(index, 1));
this.refreshRole();
}
}
clear(): void {
- dispose(this.viewItems);
- dispose(this.viewItemDisposables.values());
- this.viewItemDisposables.clear();
- this.viewItems = [];
+ this.viewItems = dispose(this.viewItems);
+ this.viewItemDisposables.clearAndDisposeAll();
DOM.clearNode(this.actionsList);
this.refreshRole();
}
@@ -579,8 +575,7 @@ export class ActionBar extends Disposable implements IActionRunner {
}
override dispose(): void {
- dispose(this.viewItems);
- this.viewItems = [];
+ this.viewItems = dispose(this.viewItems);
this.getContainer().remove();
super.dispose();
}
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index d8ac87cba86..bab11139af8 100644
Binary files a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf and b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf differ
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index b3dba065a19..55b552b724f 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -8,6 +8,7 @@
display: block;
padding: 0;
box-sizing: border-box;
+ border-radius: 2px;
/* Customizable */
font-size: inherit;
@@ -21,7 +22,7 @@
.monaco-inputbox > .ibwrapper > .mirror {
/* Customizable */
- padding: 4px;
+ padding: 4px 6px;
}
.monaco-inputbox > .ibwrapper {
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index ae89cb33f38..a9f2b326c28 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -58,7 +58,7 @@ export interface IInputValidator {
}
export interface IMessage {
- readonly content: string;
+ readonly content?: string;
readonly formatContent?: boolean; // defaults to false
readonly type?: MessageType;
}
@@ -396,7 +396,7 @@ export class InputBox extends Widget {
const styles = this.stylesForType(this.message.type);
this.element.style.border = styles.border ? `1px solid ${styles.border}` : '';
- if (this.hasFocus() || force) {
+ if (this.message.content && (this.hasFocus() || force)) {
this._showMessage();
}
}
@@ -477,8 +477,8 @@ export class InputBox extends Widget {
};
const spanElement = (this.message.formatContent
- ? renderFormattedText(this.message.content, renderOptions)
- : renderText(this.message.content, renderOptions));
+ ? renderFormattedText(this.message.content!, renderOptions)
+ : renderText(this.message.content!, renderOptions));
spanElement.classList.add(this.classForType(this.message.type));
const styles = this.stylesForType(this.message.type);
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 577ea7879dc..82fb5b18639 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -406,8 +406,12 @@ export class ListView implements ISpliceable, IDisposable {
}
}
- triggerScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
- this.scrollableElement.triggerScrollFromMouseWheelEvent(browserEvent);
+ delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+ this.scrollableElement.delegateScrollFromMouseWheelEvent(browserEvent);
+ }
+
+ delegateVerticalScrollbarPointerDown(browserEvent: PointerEvent) {
+ this.scrollableElement.delegateVerticalScrollbarPointerDown(browserEvent);
}
updateElementHeight(index: number, size: number | undefined, anchorIndex: number | null): void {
@@ -1031,6 +1035,7 @@ export class ListView implements ISpliceable, IDisposable {
setTimeout(() => document.body.removeChild(dragImage), 0);
}
+ this.domNode.classList.add('dragging');
this.currentDragData = new ElementsDragAndDropData(elements);
StaticDND.CurrentDragAndDropData = new ExternalElementsDragAndDropData(elements);
@@ -1146,6 +1151,7 @@ export class ListView implements ISpliceable, IDisposable {
const dragData = this.currentDragData;
this.teardownDragAndDropScrollTopAnimation();
this.clearDragOverFeedback();
+ this.domNode.classList.remove('dragging');
this.currentDragData = undefined;
StaticDND.CurrentDragAndDropData = undefined;
@@ -1162,6 +1168,7 @@ export class ListView implements ISpliceable, IDisposable {
this.canDrop = false;
this.teardownDragAndDropScrollTopAnimation();
this.clearDragOverFeedback();
+ this.domNode.classList.remove('dragging');
this.currentDragData = undefined;
StaticDND.CurrentDragAndDropData = undefined;
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 8ed5f2d8602..a0d02b2c621 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -869,11 +869,11 @@ export class DefaultStyleController implements IStyleController {
}
if (styles.listHoverBackground) {
- content.push(`.monaco-list${suffix}:not(.drop-target) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`);
+ content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`);
}
if (styles.listHoverForeground) {
- content.push(`.monaco-list${suffix} .monaco-list-row:hover:not(.selected):not(.focused) { color: ${styles.listHoverForeground}; }`);
+ content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { color: ${styles.listHoverForeground}; }`);
}
if (styles.listSelectionOutline) {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 4bc8ff1b8ee..5cbf7e6f192 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -5,7 +5,7 @@
import { $, append, createStyleSheet, EventHelper, EventLike } from 'vs/base/browser/dom';
import { DomEmitter } from 'vs/base/browser/event';
-import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
+import { EventType, Gesture } from 'vs/base/browser/touch';
import { Delayer } from 'vs/base/common/async';
import { memoize } from 'vs/base/common/decorators';
import { Emitter, Event } from 'vs/base/common/event';
@@ -155,6 +155,7 @@ interface PointerEvent extends EventLike {
readonly pageY: number;
readonly altKey: boolean;
readonly target: EventTarget | null;
+ readonly initialTarget?: EventTarget | undefined;
}
interface IPointerEventFactory {
@@ -419,17 +420,22 @@ export class Sash extends Disposable {
this._register(Gesture.addTarget(this.el));
- const onTouchStart = Event.map(this._register(new DomEmitter(this.el, EventType.Start)).event, e => ({ ...e, target: e.initialTarget ?? null }));
+ const onTouchStart = this._register(new DomEmitter(this.el, EventType.Start)).event;
this._register(onTouchStart(e => this.onPointerStart(e, new GestureEventFactory(this.el)), this));
const onTap = this._register(new DomEmitter(this.el, EventType.Tap)).event;
- const onDoubleTap = Event.map(
- Event.filter(
- Event.debounce(onTap, (res, event) => ({ event, count: (res?.count ?? 0) + 1 }), 250),
- ({ count }) => count === 2
- ),
- ({ event }) => ({ ...event, target: event.initialTarget ?? null })
- );
- this._register(onDoubleTap(this.onPointerDoublePress, this));
+
+ let doubleTapTimeout: any = undefined;
+ this._register(onTap(event => {
+ if (doubleTapTimeout) {
+ clearTimeout(doubleTapTimeout);
+ doubleTapTimeout = undefined;
+ this.onPointerDoublePress(event);
+ return;
+ }
+
+ clearTimeout(doubleTapTimeout);
+ doubleTapTimeout = setTimeout(() => doubleTapTimeout = undefined, 250);
+ }, this));
if (typeof options.size === 'number') {
this.size = options.size;
@@ -645,12 +651,14 @@ export class Sash extends Disposable {
}
private getOrthogonalSash(e: PointerEvent): Sash | undefined {
- if (!e.target || !(e.target instanceof HTMLElement)) {
+ const target = e.initialTarget ?? e.target;
+
+ if (!target || !(target instanceof HTMLElement)) {
return undefined;
}
- if (e.target.classList.contains('orthogonal-drag-handle')) {
- return e.target.classList.contains('start') ? this.orthogonalStartSash : this.orthogonalEndSash;
+ if (target.classList.contains('orthogonal-drag-handle')) {
+ return target.classList.contains('start') ? this.orthogonalStartSash : this.orthogonalEndSash;
}
return undefined;
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index c7bffd0c8d6..b6b6c32a1dc 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -334,7 +334,7 @@ export abstract class AbstractScrollableElement extends Widget {
this._revealOnScroll = value;
}
- public triggerScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+ public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
this._onMouseWheel(new StandardWheelEvent(browserEvent));
}
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index c0a54d83b27..d4a46f25f86 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -6,6 +6,7 @@
.monaco-select-box {
width: 100%;
cursor: pointer;
+ border-radius: 2px;
}
.monaco-select-box-dropdown-container {
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index fbf46c262fe..d31b8828697 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -14,6 +14,7 @@ import { Event } from 'vs/base/common/event';
import { IDisposable } from 'vs/base/common/lifecycle';
import { deepClone } from 'vs/base/common/objects';
import { isMacintosh } from 'vs/base/common/platform';
+import { IThemable } from 'vs/base/common/styler';
import 'vs/css!./selectBox';
@@ -77,7 +78,7 @@ export interface ISelectData {
index: number;
}
-export class SelectBox extends Widget implements ISelectBoxDelegate {
+export class SelectBox extends Widget implements ISelectBoxDelegate, IThemable {
private selectBoxDelegate: ISelectBoxDelegate;
constructor(options: ISelectOptionItem[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles), selectBoxOptions?: ISelectBoxOptions) {
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index cc09126b530..cfdaca03d75 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -15,7 +15,7 @@ import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, I
import * as arrays from 'vs/base/common/arrays';
import { Emitter, Event } from 'vs/base/common/event';
import { KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes';
-import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { isMacintosh } from 'vs/base/common/platform';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import 'vs/css!./selectBoxCustom';
@@ -31,7 +31,6 @@ interface ISelectListTemplateData {
text: HTMLElement;
detail: HTMLElement;
decoratorRight: HTMLElement;
- disposables: IDisposable[];
}
class SelectListRenderer implements IListRenderer {
@@ -40,7 +39,6 @@ class SelectListRenderer implements IListRenderer());
readonly onDidChangeExpansionState: Event = this._onDidChangeExpansionState.event;
+ get ariaHeaderLabel(): string {
+ return this._ariaHeaderLabel;
+ }
+
+ set ariaHeaderLabel(newLabel: string) {
+ this._ariaHeaderLabel = newLabel;
+ this.header.setAttribute('aria-label', this.ariaHeaderLabel);
+ }
+
get draggableElement(): HTMLElement {
return this.header;
}
@@ -127,7 +136,7 @@ export abstract class Pane extends Disposable implements IView {
super();
this._expanded = typeof options.expanded === 'undefined' ? true : !!options.expanded;
this._orientation = typeof options.orientation === 'undefined' ? Orientation.VERTICAL : options.orientation;
- this.ariaHeaderLabel = localize('viewSection', "{0} Section", options.title);
+ this._ariaHeaderLabel = localize('viewSection', "{0} Section", options.title);
this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : this._orientation === Orientation.HORIZONTAL ? 200 : 120;
this._maximumBodySize = typeof options.maximumBodySize === 'number' ? options.maximumBodySize : Number.POSITIVE_INFINITY;
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index 159c58a2797..999d2cadfd8 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -556,8 +556,13 @@ export class SplitView extends Disposable {
this.onDidScroll = this.scrollableElement.onScroll;
this._register(this.onDidScroll(e => {
- this.viewContainer.scrollTop = e.scrollTop;
- this.viewContainer.scrollLeft = e.scrollLeft;
+ if (e.scrollTopChanged) {
+ this.viewContainer.scrollTop = e.scrollTop;
+ }
+
+ if (e.scrollLeftChanged) {
+ this.viewContainer.scrollLeft = e.scrollLeft;
+ }
}));
append(this.el, this.scrollableElement.getDomNode());
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index d7f39454a0f..6ebd8c2a853 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -140,6 +140,10 @@ export class ToolBar extends Disposable {
return this.element;
}
+ focus(): void {
+ this.actionBar.focus();
+ }
+
getItemsWidth(): number {
let itemsWidth = 0;
for (let i = 0; i < this.actionBar.length(); i++) {
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index f592bca1564..c82ff404931 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -298,11 +298,6 @@ interface ITreeRendererOptions {
readonly hideTwistiesOfChildlessElements?: boolean;
}
-interface IRenderData {
- templateData: ITreeListTemplateData;
- height: number;
-}
-
interface Collection {
readonly elements: T[];
readonly onDidChange: Event;
@@ -332,12 +327,11 @@ class TreeRenderer implements IListRenderer
readonly templateId: string;
private renderedElements = new Map>();
- private renderedNodes = new Map, IRenderData>();
+ private renderedNodes = new Map, ITreeListTemplateData>();
private indent: number = TreeRenderer.DefaultIndent;
private hideTwistiesOfChildlessElements: boolean = false;
private shouldRenderIndentGuides: boolean = false;
- private renderedIndentGuides = new SetMap, HTMLDivElement>();
private activeIndentNodes = new Set>();
private indentGuidesDisposable: IDisposable = Disposable.None;
@@ -348,19 +342,27 @@ class TreeRenderer implements IListRenderer
private modelProvider: () => ITreeModel,
onDidChangeCollapseState: Event>,
private activeNodes: Collection>,
+ private renderedIndentGuides: SetMap, HTMLDivElement>,
options: ITreeRendererOptions = {}
) {
this.templateId = renderer.templateId;
this.updateOptions(options);
Event.map(onDidChangeCollapseState, e => e.node)(this.onDidChangeNodeTwistieState, this, this.disposables);
-
renderer.onDidChangeTwistieState?.(this.onDidChangeTwistieState, this, this.disposables);
}
updateOptions(options: ITreeRendererOptions = {}): void {
if (typeof options.indent !== 'undefined') {
- this.indent = clamp(options.indent, 0, 40);
+ const indent = clamp(options.indent, 0, 40);
+
+ if (indent !== this.indent) {
+ this.indent = indent;
+
+ for (const [node, templateData] of this.renderedNodes) {
+ this.renderTreeElement(node, templateData);
+ }
+ }
}
if (typeof options.renderIndentGuides !== 'undefined') {
@@ -396,21 +398,9 @@ class TreeRenderer implements IListRenderer
}
renderElement(node: ITreeNode, index: number, templateData: ITreeListTemplateData, height: number | undefined): void {
- if (typeof height === 'number') {
- this.renderedNodes.set(node, { templateData, height });
- this.renderedElements.set(node.element, node);
- }
-
- const indent = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
- templateData.twistie.style.paddingLeft = `${indent}px`;
- templateData.indent.style.width = `${indent + this.indent - 16}px`;
-
- this.renderTwistie(node, templateData);
-
- if (typeof height === 'number') {
- this.renderIndentGuides(node, templateData);
- }
-
+ this.renderedNodes.set(node, templateData);
+ this.renderedElements.set(node.element, node);
+ this.renderTreeElement(node, templateData);
this.renderer.renderElement(node, index, templateData.templateData, height);
}
@@ -440,18 +430,27 @@ class TreeRenderer implements IListRenderer
}
private onDidChangeNodeTwistieState(node: ITreeNode): void {
- const data = this.renderedNodes.get(node);
+ const templateData = this.renderedNodes.get(node);
- if (!data) {
+ if (!templateData) {
return;
}
- this.renderTwistie(node, data.templateData);
this._onDidChangeActiveNodes(this.activeNodes.elements);
- this.renderIndentGuides(node, data.templateData);
+ this.renderTreeElement(node, templateData);
}
- private renderTwistie(node: ITreeNode, templateData: ITreeListTemplateData) {
+ private renderTreeElement(node: ITreeNode, templateData: ITreeListTemplateData) {
+ const indent = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
+ templateData.twistie.style.paddingLeft = `${indent}px`;
+ templateData.indent.style.width = `${indent + this.indent - 16}px`;
+
+ if (node.collapsible) {
+ templateData.container.setAttribute('aria-expanded', String(!node.collapsed));
+ } else {
+ templateData.container.removeAttribute('aria-expanded');
+ }
+
templateData.twistie.classList.remove(...Codicon.treeItemExpanded.classNamesArray);
let twistieRendered = false;
@@ -471,14 +470,6 @@ class TreeRenderer implements IListRenderer
templateData.twistie.classList.remove('collapsible', 'collapsed');
}
- if (node.collapsible) {
- templateData.container.setAttribute('aria-expanded', String(!node.collapsed));
- } else {
- templateData.container.removeAttribute('aria-expanded');
- }
- }
-
- private renderIndentGuides(target: ITreeNode, templateData: ITreeListTemplateData): void {
clearNode(templateData.indent);
templateData.indentGuidesDisposable.dispose();
@@ -489,8 +480,6 @@ class TreeRenderer implements IListRenderer
const disposableStore = new DisposableStore();
const model = this.modelProvider();
- let node = target;
-
while (true) {
const ref = model.getNodeLocation(node);
const parentRef = model.getParentNodeLocation(ref);
@@ -695,11 +684,20 @@ class FindWidget extends Disposable {
this.findInput.inputBox.setPlaceHolder(mode === TreeFindMode.Filter ? localize('type to filter', "Type to filter") : localize('type to search', "Type to search"));
}
+ get value(): string {
+ return this.findInput.inputBox.value;
+ }
+
+ set value(value: string) {
+ this.findInput.inputBox.value = value;
+ }
+
private readonly modeToggle: ModeToggle;
private readonly findInput: FindInput;
private readonly actionbar: ActionBar;
private width = 0;
private right = 0;
+ private top = 0;
readonly _onDidDisable = new Emitter();
readonly onDidDisable = this._onDidDisable.event;
@@ -757,11 +755,18 @@ class FindWidget extends Disposable {
const startRight = this.right;
const startX = e.pageX;
+ const startTop = this.top;
+ const startY = e.pageY;
this.elements.grab.classList.add('grabbing');
+ const transition = this.elements.root.style.transition;
+ this.elements.root.style.transition = 'unset';
+
const update = (e: MouseEvent) => {
const deltaX = e.pageX - startX;
this.right = startRight - deltaX;
+ const deltaY = e.pageY - startY;
+ this.top = startTop + deltaY;
this.layout();
};
@@ -769,6 +774,7 @@ class FindWidget extends Disposable {
disposables.add(onWindowMouseUp.event(e => {
update(e);
this.elements.grab.classList.remove('grabbing');
+ this.elements.root.style.transition = transition;
disposables.dispose();
}));
}));
@@ -779,6 +785,7 @@ class FindWidget extends Disposable {
this._register(onGrabKeyDown((e): any => {
let right: number | undefined;
+ let top: number | undefined;
if (e.keyCode === KeyCode.LeftArrow) {
right = Number.POSITIVE_INFINITY;
@@ -788,12 +795,30 @@ class FindWidget extends Disposable {
right = this.right === 0 ? Number.POSITIVE_INFINITY : 0;
}
+ if (e.keyCode === KeyCode.UpArrow) {
+ top = 0;
+ } else if (e.keyCode === KeyCode.DownArrow) {
+ top = Number.POSITIVE_INFINITY;
+ }
+
if (right !== undefined) {
e.preventDefault();
e.stopPropagation();
this.right = right;
this.layout();
}
+
+ if (top !== undefined) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.top = top;
+ const transition = this.elements.root.style.transition;
+ this.elements.root.style.transition = 'unset';
+ this.layout();
+ setTimeout(() => {
+ this.elements.root.style.transition = transition;
+ }, 0);
+ }
}));
this.onDidChangeValue = this.findInput.onDidChange;
@@ -824,6 +849,8 @@ class FindWidget extends Disposable {
this.width = width;
this.right = clamp(this.right, 0, Math.max(0, width - 212));
this.elements.root.style.right = `${this.right}px`;
+ this.top = clamp(this.top, 0, 24);
+ this.elements.root.style.top = `${this.top}px`;
}
showMessage(message: IMessage): void {
@@ -846,6 +873,7 @@ class FindController implements IDisposable {
private _pattern = '';
get pattern(): string { return this._pattern; }
+ private previousPattern = '';
private _mode: TreeFindMode;
get mode(): TreeFindMode { return this._mode; }
@@ -910,6 +938,9 @@ class FindController implements IDisposable {
this.widget.layout(this.width);
this.widget.focus();
+ this.widget.value = this.previousPattern;
+ this.widget.select();
+
this._onDidChangeOpenState.fire(true);
}
@@ -923,6 +954,7 @@ class FindController implements IDisposable {
this.enabledDisposables.dispose();
this.enabledDisposables = new DisposableStore();
+ this.previousPattern = this.pattern;
this.onDidChangeValue('');
this.tree.domFocus();
@@ -966,7 +998,11 @@ class FindController implements IDisposable {
const noMatches = this.filter.totalCount > 0 && this.filter.matchCount === 0;
if (this.pattern && noMatches) {
- this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No elements found.") });
+ if (this.tree.options.showNotFoundMessage ?? true) {
+ this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No elements found.") });
+ } else {
+ this.widget?.showMessage({ type: MessageType.WARNING });
+ }
} else {
this.widget?.clearMessage();
}
@@ -1032,6 +1068,7 @@ export interface IAbstractTreeOptionsUpdate extends ITreeRendererOptions {
readonly typeNavigationEnabled?: boolean;
readonly typeNavigationMode?: TypeNavigationMode;
readonly defaultFindMode?: TreeFindMode;
+ readonly showNotFoundMessage?: boolean;
readonly smoothScrolling?: boolean;
readonly horizontalScrolling?: boolean;
readonly mouseWheelScrollSensitivity?: number;
@@ -1400,7 +1437,8 @@ export abstract class AbstractTree implements IDisposable
const onDidChangeCollapseStateRelay = new Relay>();
const onDidChangeActiveNodes = new Relay[]>();
const activeNodes = this.disposables.add(new EventCollection(onDidChangeActiveNodes.event));
- this.renderers = renderers.map(r => new TreeRenderer(r, () => this.model, onDidChangeCollapseStateRelay.event, activeNodes, _options));
+ const renderedIndentGuides = new SetMap, HTMLDivElement>();
+ this.renderers = renderers.map(r => new TreeRenderer(r, () => this.model, onDidChangeCollapseStateRelay.event, activeNodes, renderedIndentGuides, _options));
for (const r of this.renderers) {
this.disposables.add(r);
}
diff --git a/src/vs/base/browser/ui/tree/media/tree.css b/src/vs/base/browser/ui/tree/media/tree.css
index bee620d57ef..9256e1e8077 100644
--- a/src/vs/base/browser/ui/tree/media/tree.css
+++ b/src/vs/base/browser/ui/tree/media/tree.css
@@ -83,7 +83,7 @@
}
.monaco-tree-type-filter.disabled {
- top: -40px;
+ top: -40px !important;
}
.monaco-tree-type-filter-grab {
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index 13db4add519..769e8039d7f 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -219,7 +219,7 @@ export class Separator implements IAction {
readonly label: string = '';
readonly tooltip: string = '';
- readonly class: string = '';
+ readonly class: string = 'separator';
readonly enabled: boolean = false;
readonly checked: boolean = false;
async run() { }
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index f4f79545b3a..232375b7f10 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -1111,7 +1111,22 @@ export interface IdleDeadline {
}
/**
- * Execute the callback the next time the browser is idle
+ * Execute the callback the next time the browser is idle, returning an
+ * {@link IDisposable} that will cancel the callback when disposed. This wraps
+ * [requestIdleCallback] so it will fallback to [setTimeout] if the environment
+ * doesn't support it.
+ *
+ * @param callback The callback to run when idle, this includes an
+ * [IdleDeadline] that provides the time alloted for the idle callback by the
+ * browser. Not respecting this deadline will result in a degraded user
+ * experience.
+ * @param timeout A timeout at which point to queue no longer wait for an idle
+ * callback but queue it on the regular event loop (like setTimeout). Typically
+ * this should not be used.
+ *
+ * [IdleDeadline]: https://developer.mozilla.org/en-US/docs/Web/API/IdleDeadline
+ * [requestIdleCallback]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback
+ * [setTimeout]: https://developer.mozilla.org/en-US/docs/Web/API/Window/setTimeout
*/
export let runWhenIdle: (callback: (idle: IdleDeadline) => void, timeout?: number) => IDisposable;
diff --git a/src/vs/base/common/color.ts b/src/vs/base/common/color.ts
index dcdc00dcee3..750cfe7dc71 100644
--- a/src/vs/base/common/color.ts
+++ b/src/vs/base/common/color.ts
@@ -259,6 +259,16 @@ export class Color {
return Color.Format.CSS.parseHex(hex) || Color.red;
}
+ static equals(a: Color | null, b: Color | null): boolean {
+ if (!a && !b) {
+ return true;
+ }
+ if (!a || !b) {
+ return false;
+ }
+ return a.equals(b);
+ }
+
readonly rgba: RGBA;
private _hsla?: HSLA;
get hsla(): HSLA {
diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index 44b25af9e3a..bea757b1ac6 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -123,15 +123,15 @@ export function transformErrorForSerialization(error: any): any {
// see https://github.com/v8/v8/wiki/Stack%20Trace%20API#basic-stack-traces
export interface V8CallSite {
- getThis(): any;
- getTypeName(): string;
- getFunction(): string;
- getFunctionName(): string;
- getMethodName(): string;
- getFileName(): string;
- getLineNumber(): number;
- getColumnNumber(): number;
- getEvalOrigin(): string;
+ getThis(): unknown;
+ getTypeName(): string | null;
+ getFunction(): Function | undefined;
+ getFunctionName(): string | null;
+ getMethodName(): string | null;
+ getFileName(): string | null;
+ getLineNumber(): number | null;
+ getColumnNumber(): number | null;
+ getEvalOrigin(): string | undefined;
isToplevel(): boolean;
isEval(): boolean;
isNative(): boolean;
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 2771802f1de..7d6e1da0c0d 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -5,7 +5,7 @@
export namespace Iterable {
- export function is(thing: any): thing is IterableIterator {
+ export function is(thing: any): thing is Iterable {
return thing && typeof thing === 'object' && typeof thing[Symbol.iterator] === 'function';
}
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index da910eb4e77..d58b2fa2155 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -6,6 +6,8 @@
import { once } from 'vs/base/common/functional';
import { Iterable } from 'vs/base/common/iterator';
+// #region Disposable Tracking
+
/**
* Enables logging of potentially leaked disposables.
*
@@ -108,20 +110,37 @@ export function markAsSingleton(singleton: T): T {
return singleton;
}
+// #endregion
+
+/**
+ * An object that performs a cleanup operation when `.dispose()` is called.
+ *
+ * Some examples of how disposables are used:
+ *
+ * - An event listener that removes itself when `.dispose()` is called.
+ * - A resource such as a file system watcher that cleans up the resource when `.dispose()` is called.
+ * - The return value from registering a provider. When `.dispose()` is called, the provider is unregistered.
+ */
export interface IDisposable {
dispose(): void;
}
+/**
+ * Check if `thing` is {@link IDisposable disposable}.
+ */
export function isDisposable(thing: E): thing is E & IDisposable {
return typeof (thing).dispose === 'function' && (thing).dispose.length === 0;
}
+/**
+ * Disposes of the value(s) passed in.
+ */
export function dispose(disposable: T): T;
export function dispose(disposable: T | undefined): T | undefined;
-export function dispose = IterableIterator>(disposables: IterableIterator): A;
+export function dispose = Iterable>(disposables: A): A;
export function dispose(disposables: Array): Array;
export function dispose(disposables: ReadonlyArray): ReadonlyArray;
-export function dispose(arg: T | IterableIterator | undefined): any {
+export function dispose(arg: T | Iterable | undefined): any {
if (Iterable.is(arg)) {
const errors: any[] = [];
@@ -157,12 +176,18 @@ export function disposeIfDisposable(disposables:
return [];
}
+/**
+ * Combine multiple disposable values into a single {@link IDisposable}.
+ */
export function combinedDisposable(...disposables: IDisposable[]): IDisposable {
const parent = toDisposable(() => dispose(disposables));
setParentOfDisposables(disposables, parent);
return parent;
}
+/**
+ * Turn a function that implements dispose into an {@link IDisposable}.
+ */
export function toDisposable(fn: () => void): IDisposable {
const self = trackDisposable({
dispose: once(() => {
@@ -173,11 +198,18 @@ export function toDisposable(fn: () => void): IDisposable {
return self;
}
+/**
+ * Manages a collection of disposable values.
+ *
+ * This is the preferred way to manage multiple disposables. A `DisposableStore` is safer to work with than an
+ * `IDisposable[]` as it considers edge cases, such as registering the same value multiple times or adding an item to a
+ * store that has already been disposed of.
+ */
export class DisposableStore implements IDisposable {
static DISABLE_DISPOSED_WARNING = false;
- private _toDispose = new Set();
+ private readonly _toDispose = new Set();
private _isDisposed = false;
constructor() {
@@ -200,7 +232,7 @@ export class DisposableStore implements IDisposable {
}
/**
- * Returns `true` if this object has been disposed
+ * @return `true` if this object has been disposed of.
*/
public get isDisposed(): boolean {
return this._isDisposed;
@@ -210,13 +242,20 @@ export class DisposableStore implements IDisposable {
* Dispose of all registered disposables but do not mark this object as disposed.
*/
public clear(): void {
+ if (this._toDispose.size === 0) {
+ return;
+ }
+
try {
- dispose(this._toDispose.values());
+ dispose(this._toDispose);
} finally {
this._toDispose.clear();
}
}
+ /**
+ * Add a new {@link IDisposable disposable} to the collection.
+ */
public add(o: T): T {
if (!o) {
return o;
@@ -238,8 +277,18 @@ export class DisposableStore implements IDisposable {
}
}
+/**
+ * Abstract base class for a {@link IDisposable disposable} object.
+ *
+ * Subclasses can {@linkcode _register} disposables that will be automatically cleaned up when this object is disposed of.
+ */
export abstract class Disposable implements IDisposable {
+ /**
+ * A disposable that does nothing when it is disposed of.
+ *
+ * TODO: This should not be a static property.
+ */
static readonly None = Object.freeze({ dispose() { } });
protected readonly _store = new DisposableStore();
@@ -255,6 +304,9 @@ export abstract class Disposable implements IDisposable {
this._store.dispose();
}
+ /**
+ * Adds `o` to the collection of disposables managed by this object.
+ */
protected _register(o: T): T {
if ((o as unknown as Disposable) === this) {
throw new Error('Cannot register a disposable on itself!');
@@ -293,7 +345,10 @@ export class MutableDisposable